aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorsimonb <simonb>2006-05-20 15:08:14 (GMT)
committersimonb <simonb>2006-05-20 15:08:14 (GMT)
commit0861f3a9073ccd016302af26ff992fa19331a02d (patch)
treef1a2276449a5fc9b27f2d1afa5ffff4410141345 /src/Screen.hh
parent5ddabb0f390f69db793b5a6e40be9f94b8f83136 (diff)
downloadfluxbox_pavel-0861f3a9073ccd016302af26ff992fa19331a02d.zip
fluxbox_pavel-0861f3a9073ccd016302af26ff992fa19331a02d.tar.bz2
improve native language handling, move messages and menu labels to
FbTk::FbString
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 74a5ff9..29bf26d 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -98,7 +98,7 @@ public:
98 98
99 typedef std::vector<Workspace *> Workspaces; 99 typedef std::vector<Workspace *> Workspaces;
100 typedef std::vector<std::string> WorkspaceNames; 100 typedef std::vector<std::string> WorkspaceNames;
101 typedef std::list<std::pair<const char *, FbTk::Menu *> > ExtraMenus; 101 typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > ExtraMenus;
102 102
103 BScreen(FbTk::ResourceManager &rm, 103 BScreen(FbTk::ResourceManager &rm,
104 const std::string &screenname, const std::string &altscreenname, 104 const std::string &screenname, const std::string &altscreenname,
@@ -213,7 +213,7 @@ public:
213 // for extras to add menus. 213 // for extras to add menus.
214 // These menus will be marked internal, 214 // These menus will be marked internal,
215 // and deleted when the window dies (as opposed to Screen 215 // and deleted when the window dies (as opposed to Screen
216 void addExtraWindowMenu(const char *label, FbTk::Menu *menu); 216 void addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu);
217 void removeExtraWindowMenu(FbTk::Menu *menu); 217 void removeExtraWindowMenu(FbTk::Menu *menu);
218 218
219 /// hide all windowmenus except the given one (if given) 219 /// hide all windowmenus except the given one (if given)
@@ -358,7 +358,7 @@ public:
358 // for extras to add menus. These menus must be marked 358 // for extras to add menus. These menus must be marked
359 // internal for their safety, and __the extension__ must 359 // internal for their safety, and __the extension__ must
360 // delete and remove the menu itself (opposite to Window) 360 // delete and remove the menu itself (opposite to Window)
361 void addConfigMenu(const char *label, FbTk::Menu &menu); 361 void addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu);
362 void removeConfigMenu(FbTk::Menu &menu); 362 void removeConfigMenu(FbTk::Menu &menu);
363 363
364 364
@@ -410,7 +410,7 @@ private:
410 410
411 typedef std::list<FbTk::Menu *> Rootmenus; 411 typedef std::list<FbTk::Menu *> Rootmenus;
412 typedef std::list<Netizen *> Netizens; 412 typedef std::list<Netizen *> Netizens;
413 typedef std::list<std::pair<const char *, FbTk::Menu *> > Configmenus; 413 typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > Configmenus;
414 414
415 415
416 Rootmenus m_rootmenu_list; 416 Rootmenus m_rootmenu_list;