aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorakir <akir>2004-08-31 19:27:21 (GMT)
committerakir <akir>2004-08-31 19:27:21 (GMT)
commited88b106daf83c4369a21fd06860aa372cb3b7cf (patch)
tree32ecb2b5c99771cff1e045ac6d5a186781d231e1 /src
parentd17bf39a43a7581773c67d496e4022499d59cd26 (diff)
downloadfluxbox-ed88b106daf83c4369a21fd06860aa372cb3b7cf.zip
fluxbox-ed88b106daf83c4369a21fd06860aa372cb3b7cf.tar.bz2
fix for gcc 2.95.4 -> has problems to get the right template-types
for make_pair
Diffstat (limited to 'src')
-rw-r--r--src/Slit.cc23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 4068bca..f960ac8 100644
--- a/src/Slit.cc
+++ b/src/Slit.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: Slit.cc,v 1.98 2004/08/31 15:26:38 rathnor Exp $ 25// $Id: Slit.cc,v 1.99 2004/08/31 19:27:21 akir Exp $
26 26
27#include "Slit.hh" 27#include "Slit.hh"
28 28
@@ -1232,19 +1232,20 @@ void Slit::setupMenu() {
1232 m_layermenu->setInternalMenu(); 1232 m_layermenu->setInternalMenu();
1233 m_clientlist_menu.setInternalMenu(); 1233 m_clientlist_menu.setInternalMenu();
1234 1234
1235 typedef list<pair<const char *, Slit::Placement> > Placements; 1235 typedef pair<const char *, Slit::Placement> PlacementP;
1236 typedef list<PlacementP> Placements;
1236 Placements place_menu; 1237 Placements place_menu;
1237 1238
1238 // menu is 3 wide, 5 down 1239 // menu is 3 wide, 5 down
1239 place_menu.push_back(make_pair(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), Slit::TOPLEFT)); 1240 place_menu.push_back(PlacementP(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), Slit::TOPLEFT));
1240 place_menu.push_back(make_pair(_FBTEXT(Align, LeftCenter, "Left Center", "Left Center"), Slit::LEFTCENTER)); 1241 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftCenter, "Left Center", "Left Center"), Slit::LEFTCENTER));
1241 place_menu.push_back(make_pair(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), Slit::BOTTOMLEFT)); 1242 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), Slit::BOTTOMLEFT));
1242 place_menu.push_back(make_pair(_FBTEXT(Align, TopCenter, "Top Center", "Top Center"), Slit::TOPCENTER)); 1243 place_menu.push_back(PlacementP(_FBTEXT(Align, TopCenter, "Top Center", "Top Center"), Slit::TOPCENTER));
1243 place_menu.push_back(make_pair((const char *)0, Slit::TOPLEFT)); 1244 place_menu.push_back(PlacementP((const char *)0, Slit::TOPLEFT));
1244 place_menu.push_back(make_pair(_FBTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), Slit::BOTTOMCENTER)); 1245 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomCenter, "Bottom Center", "Bottom Center"), Slit::BOTTOMCENTER));
1245 place_menu.push_back(make_pair(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), Slit::TOPRIGHT)); 1246 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), Slit::TOPRIGHT));
1246 place_menu.push_back(make_pair(_FBTEXT(Align, RightCenter, "Right Center", "Right Center"), Slit::RIGHTCENTER)); 1247 place_menu.push_back(PlacementP(_FBTEXT(Align, RightCenter, "Right Center", "Right Center"), Slit::RIGHTCENTER));
1247 place_menu.push_back(make_pair(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), Slit::BOTTOMRIGHT)); 1248 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), Slit::BOTTOMRIGHT));
1248 1249
1249 1250
1250 // create items in sub menu 1251 // create items in sub menu