summaryrefslogtreecommitdiff
path: root/src/FbWinFrame.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r--src/FbWinFrame.cc30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index c65f0b6..f23568b 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -19,13 +19,15 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWinFrame.cc,v 1.36 2003/08/13 16:36:37 fluxgen Exp $ 22// $Id: FbWinFrame.cc,v 1.37 2003/08/19 16:13:25 fluxgen Exp $
23 23
24#include "FbWinFrame.hh" 24#include "FbWinFrame.hh"
25#include "ImageControl.hh" 25
26#include "EventManager.hh" 26#include "FbTk/ImageControl.hh"
27#include "TextButton.hh" 27#include "FbTk/EventManager.hh"
28#include "App.hh" 28#include "FbTk/TextButton.hh"
29#include "FbTk/App.hh"
30
29#include "FbWinFrameTheme.hh" 31#include "FbWinFrameTheme.hh"
30#ifdef SHAPE 32#ifdef SHAPE
31#include "Shape.hh" 33#include "Shape.hh"
@@ -271,7 +273,7 @@ void FbWinFrame::removeAllButtons() {
271 } 273 }
272} 274}
273 275
274void FbWinFrame::addLabelButton(TextButton &btn) { 276void FbWinFrame::addLabelButton(FbTk::TextButton &btn) {
275 LabelList::iterator found_it = find(m_labelbuttons.begin(), 277 LabelList::iterator found_it = find(m_labelbuttons.begin(),
276 m_labelbuttons.end(), 278 m_labelbuttons.end(),
277 &btn); 279 &btn);
@@ -282,7 +284,7 @@ void FbWinFrame::addLabelButton(TextButton &btn) {
282 m_labelbuttons.push_back(&btn); 284 m_labelbuttons.push_back(&btn);
283} 285}
284 286
285void FbWinFrame::removeLabelButton(TextButton &btn) { 287void FbWinFrame::removeLabelButton(FbTk::TextButton &btn) {
286 LabelList::iterator erase_it = remove(m_labelbuttons.begin(), 288 LabelList::iterator erase_it = remove(m_labelbuttons.begin(),
287 m_labelbuttons.end(), 289 m_labelbuttons.end(),
288 &btn); 290 &btn);
@@ -293,7 +295,7 @@ void FbWinFrame::removeLabelButton(TextButton &btn) {
293} 295}
294 296
295 297
296void FbWinFrame::moveLabelButtonLeft(const TextButton &btn) { 298void FbWinFrame::moveLabelButtonLeft(const FbTk::TextButton &btn) {
297 LabelList::iterator it = find(m_labelbuttons.begin(), 299 LabelList::iterator it = find(m_labelbuttons.begin(),
298 m_labelbuttons.end(), 300 m_labelbuttons.end(),
299 &btn); 301 &btn);
@@ -303,7 +305,7 @@ void FbWinFrame::moveLabelButtonLeft(const TextButton &btn) {
303 305
304 LabelList::iterator new_pos = it; 306 LabelList::iterator new_pos = it;
305 new_pos--; 307 new_pos--;
306 TextButton *item = *it; 308 FbTk::TextButton *item = *it;
307 // remove from list 309 // remove from list
308 m_labelbuttons.erase(it); 310 m_labelbuttons.erase(it);
309 // insert on the new place 311 // insert on the new place
@@ -312,7 +314,7 @@ void FbWinFrame::moveLabelButtonLeft(const TextButton &btn) {
312 redrawTitle(); 314 redrawTitle();
313} 315}
314 316
315void FbWinFrame::moveLabelButtonRight(const TextButton &btn) { 317void FbWinFrame::moveLabelButtonRight(const FbTk::TextButton &btn) {
316 LabelList::iterator it = find(m_labelbuttons.begin(), 318 LabelList::iterator it = find(m_labelbuttons.begin(),
317 m_labelbuttons.end(), 319 m_labelbuttons.end(),
318 &btn); 320 &btn);
@@ -320,7 +322,7 @@ void FbWinFrame::moveLabelButtonRight(const TextButton &btn) {
320 if (it == m_labelbuttons.end() || *it == m_labelbuttons.back()) 322 if (it == m_labelbuttons.end() || *it == m_labelbuttons.back())
321 return; 323 return;
322 324
323 TextButton *item = *it; 325 FbTk::TextButton *item = *it;
324 // remove from list 326 // remove from list
325 LabelList::iterator new_pos = m_labelbuttons.erase(it); 327 LabelList::iterator new_pos = m_labelbuttons.erase(it);
326 new_pos++; 328 new_pos++;
@@ -330,7 +332,7 @@ void FbWinFrame::moveLabelButtonRight(const TextButton &btn) {
330 redrawTitle(); 332 redrawTitle();
331} 333}
332 334
333void FbWinFrame::setLabelButtonFocus(TextButton &btn) { 335void FbWinFrame::setLabelButtonFocus(FbTk::TextButton &btn) {
334 LabelList::iterator it = find(m_labelbuttons.begin(), 336 LabelList::iterator it = find(m_labelbuttons.begin(),
335 m_labelbuttons.end(), 337 m_labelbuttons.end(),
336 &btn); 338 &btn);
@@ -1031,7 +1033,7 @@ void FbWinFrame::setBorderWidth(unsigned int borderW) {
1031 resize(width(), height() + bw_changes); 1033 resize(width(), height() + bw_changes);
1032} 1034}
1033 1035
1034void FbWinFrame::renderButtonFocus(TextButton &button) { 1036void FbWinFrame::renderButtonFocus(FbTk::TextButton &button) {
1035 1037
1036 button.setGC(theme().labelTextFocusGC()); 1038 button.setGC(theme().labelTextFocusGC());
1037 button.setJustify(theme().justify()); 1039 button.setJustify(theme().justify());
@@ -1046,7 +1048,7 @@ void FbWinFrame::renderButtonFocus(TextButton &button) {
1046 button.clear(); 1048 button.clear();
1047} 1049}
1048 1050
1049void FbWinFrame::renderButtonUnfocus(TextButton &button) { 1051void FbWinFrame::renderButtonUnfocus(FbTk::TextButton &button) {
1050 button.setGC(theme().labelTextUnfocusGC()); 1052 button.setGC(theme().labelTextUnfocusGC());
1051 button.setJustify(theme().justify()); 1053 button.setJustify(theme().justify());
1052 button.setBorderWidth(1); 1054 button.setBorderWidth(1);