summaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index a863b3f..ba21af8 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -863,7 +863,7 @@ void Toolbar::setupMenus() {
863 } 863 }
864#endif // XINERAMA 864#endif // XINERAMA
865 865
866 typedef pair<const char*, Toolbar::Placement> PlacementP; 866 typedef pair<FbTk::FbString, Toolbar::Placement> PlacementP;
867 typedef list<PlacementP> Placements; 867 typedef list<PlacementP> Placements;
868 Placements place_menu; 868 Placements place_menu;
869 869
@@ -874,9 +874,9 @@ void Toolbar::setupMenus() {
874 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), Toolbar::LEFTBOTTOM)); 874 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), Toolbar::LEFTBOTTOM));
875 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), Toolbar::BOTTOMLEFT)); 875 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), Toolbar::BOTTOMLEFT));
876 place_menu.push_back(PlacementP(_FBTEXT(Align, TopCenter, "Top Center", "Top Center"), Toolbar::TOPCENTER)); 876 place_menu.push_back(PlacementP(_FBTEXT(Align, TopCenter, "Top Center", "Top Center"), Toolbar::TOPCENTER));
877 place_menu.push_back(PlacementP((const char *)0, Toolbar::TOPLEFT)); 877 place_menu.push_back(PlacementP("", Toolbar::TOPLEFT));
878 place_menu.push_back(PlacementP((const char *)0, Toolbar::TOPLEFT)); 878 place_menu.push_back(PlacementP("", Toolbar::TOPLEFT));
879 place_menu.push_back(PlacementP((const char *)0, Toolbar::TOPLEFT)); 879 place_menu.push_back(PlacementP("", Toolbar::TOPLEFT));
880 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), Toolbar::BOTTOMCENTER)); 880 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), Toolbar::BOTTOMCENTER));
881 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), Toolbar::TOPRIGHT)); 881 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), Toolbar::TOPRIGHT));
882 place_menu.push_back(PlacementP(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), Toolbar::RIGHTTOP)); 882 place_menu.push_back(PlacementP(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), Toolbar::RIGHTTOP));
@@ -888,10 +888,10 @@ void Toolbar::setupMenus() {
888 placementMenu().setMinimumSublevels(3); 888 placementMenu().setMinimumSublevels(3);
889 // create items in sub menu 889 // create items in sub menu
890 for (size_t i=0; i<15; ++i) { 890 for (size_t i=0; i<15; ++i) {
891 const char *str = place_menu.front().first; 891 FbTk::FbString &str = place_menu.front().first;
892 Toolbar::Placement placement = place_menu.front().second; 892 Toolbar::Placement placement = place_menu.front().second;
893 893
894 if (str == 0) { 894 if (str == "") {
895 placementMenu().insert(""); 895 placementMenu().insert("");
896 placementMenu().setItemEnabled(i, false); 896 placementMenu().setItemEnabled(i, false);
897 } else { 897 } else {