aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakir <akir>2004-08-31 19:38:42 (GMT)
committerakir <akir>2004-08-31 19:38:42 (GMT)
commita182e88412d7eaafe0dfd7e32aa7100c4a9f677a (patch)
tree6b85de846b76c3cd5ef3331b1b5642036b53011f
parented88b106daf83c4369a21fd06860aa372cb3b7cf (diff)
downloadfluxbox_pavel-a182e88412d7eaafe0dfd7e32aa7100c4a9f677a.zip
fluxbox_pavel-a182e88412d7eaafe0dfd7e32aa7100c4a9f677a.tar.bz2
fix for gcc 2.95.4, again make_pair and missing #include <typeinfo> before
typeid-usage
-rw-r--r--src/Toolbar.cc38
1 files changed, 20 insertions, 18 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index e504a9a..2c19518 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.151 2004/08/31 15:26:38 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.152 2004/08/31 19:38:42 akir Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -68,6 +68,7 @@
68 #include <string.h> 68 #include <string.h>
69#endif 69#endif
70#include <iterator> 70#include <iterator>
71#include <typeinfo>
71 72
72using namespace std; 73using namespace std;
73 74
@@ -832,26 +833,27 @@ void Toolbar::setupMenus() {
832 *this, 833 *this,
833 _FBTEXT(Toolbar, OnHead, "Toolbar on Head", "Title of toolbar on head menu"))); 834 _FBTEXT(Toolbar, OnHead, "Toolbar on Head", "Title of toolbar on head menu")));
834 } 835 }
835 836
836 typedef list<pair<const char *, Toolbar::Placement> > Placements; 837 typedef pair<const char*, Toolbar::Placement> PlacementP;
838 typedef list<PlacementP> Placements;
837 Placements place_menu; 839 Placements place_menu;
838 840
839 // menu is 3 wide, 5 down 841 // menu is 3 wide, 5 down
840 place_menu.push_back(make_pair(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), Toolbar::TOPLEFT)); 842 place_menu.push_back(PlacementP(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), Toolbar::TOPLEFT));
841 place_menu.push_back(make_pair(_FBTEXT(Align, LeftTop, "Left Top", "Left Top"), Toolbar::LEFTTOP)); 843 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftTop, "Left Top", "Left Top"), Toolbar::LEFTTOP));
842 place_menu.push_back(make_pair(_FBTEXT(Align, LeftCenter, "Left Center", "Left Center"), Toolbar::LEFTCENTER)); 844 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftCenter, "Left Center", "Left Center"), Toolbar::LEFTCENTER));
843 place_menu.push_back(make_pair(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), Toolbar::LEFTBOTTOM)); 845 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), Toolbar::LEFTBOTTOM));
844 place_menu.push_back(make_pair(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), Toolbar::BOTTOMLEFT)); 846 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), Toolbar::BOTTOMLEFT));
845 place_menu.push_back(make_pair(_FBTEXT(Align, TopCenter, "Top Center", "Top Center"), Toolbar::TOPCENTER)); 847 place_menu.push_back(PlacementP(_FBTEXT(Align, TopCenter, "Top Center", "Top Center"), Toolbar::TOPCENTER));
846 place_menu.push_back(make_pair((const char *)0, Toolbar::TOPLEFT)); 848 place_menu.push_back(PlacementP((const char *)0, Toolbar::TOPLEFT));
847 place_menu.push_back(make_pair((const char *)0, Toolbar::TOPLEFT)); 849 place_menu.push_back(PlacementP((const char *)0, Toolbar::TOPLEFT));
848 place_menu.push_back(make_pair((const char *)0, Toolbar::TOPLEFT)); 850 place_menu.push_back(PlacementP((const char *)0, Toolbar::TOPLEFT));
849 place_menu.push_back(make_pair(_FBTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), Toolbar::BOTTOMCENTER)); 851 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), Toolbar::BOTTOMCENTER));
850 place_menu.push_back(make_pair(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), Toolbar::TOPRIGHT)); 852 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), Toolbar::TOPRIGHT));
851 place_menu.push_back(make_pair(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), Toolbar::RIGHTTOP)); 853 place_menu.push_back(PlacementP(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), Toolbar::RIGHTTOP));
852 place_menu.push_back(make_pair(_FBTEXT(Align, RightCenter, "Right Center", "Right Center"), Toolbar::RIGHTCENTER)); 854 place_menu.push_back(PlacementP(_FBTEXT(Align, RightCenter, "Right Center", "Right Center"), Toolbar::RIGHTCENTER));
853 place_menu.push_back(make_pair(_FBTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), Toolbar::RIGHTBOTTOM)); 855 place_menu.push_back(PlacementP(_FBTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), Toolbar::RIGHTBOTTOM));
854 place_menu.push_back(make_pair(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), Toolbar::BOTTOMRIGHT)); 856 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), Toolbar::BOTTOMRIGHT));
855 857
856 858
857 placementMenu().setMinimumSublevels(3); 859 placementMenu().setMinimumSublevels(3);