diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Basemenu.cc | 6 | ||||
-rw-r--r-- | src/Basemenu.hh | 4 | ||||
-rw-r--r-- | src/Screen.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 22e8886..71bc66d 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.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: Basemenu.cc,v 1.15 2002/03/23 15:14:45 fluxgen Exp $ | 25 | // $Id: Basemenu.cc,v 1.16 2002/03/27 18:47:12 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -224,7 +224,7 @@ int Basemenu::insert(const char *label, Basemenu *submenu, int pos) { | |||
224 | return menuitems.size(); | 224 | return menuitems.size(); |
225 | } | 225 | } |
226 | 226 | ||
227 | 227 | /* | |
228 | int Basemenu::insert(const char **ulabel, int pos, int function) { | 228 | int Basemenu::insert(const char **ulabel, int pos, int function) { |
229 | assert(ulabel); | 229 | assert(ulabel); |
230 | BasemenuItem *item = new BasemenuItem(*ulabel, function); | 230 | BasemenuItem *item = new BasemenuItem(*ulabel, function); |
@@ -236,7 +236,7 @@ int Basemenu::insert(const char **ulabel, int pos, int function) { | |||
236 | 236 | ||
237 | return menuitems.size(); | 237 | return menuitems.size(); |
238 | } | 238 | } |
239 | 239 | */ | |
240 | 240 | ||
241 | int Basemenu::remove(unsigned int index) { | 241 | int Basemenu::remove(unsigned int index) { |
242 | if (index >= menuitems.size()) { | 242 | if (index >= menuitems.size()) { |
diff --git a/src/Basemenu.hh b/src/Basemenu.hh index d2794ff..c5c2b9c 100644 --- a/src/Basemenu.hh +++ b/src/Basemenu.hh | |||
@@ -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: Basemenu.hh,v 1.8 2002/03/20 14:10:03 fluxgen Exp $ | 25 | // $Id: Basemenu.hh,v 1.9 2002/03/27 18:47:12 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef BASEMENU_HH | 27 | #ifndef BASEMENU_HH |
28 | #define BASEMENU_HH | 28 | #define BASEMENU_HH |
@@ -53,7 +53,7 @@ public: | |||
53 | 53 | ||
54 | inline const char *getLabel(void) const { return menu.label; } | 54 | inline const char *getLabel(void) const { return menu.label; } |
55 | 55 | ||
56 | int insert(const char *, int = 0, const char * = (const char *) 0, int = -1); | 56 | int insert(const char *, int = 0, const char * = 0, int = -1); |
57 | int insert(const char **, int = -1, int = 0); | 57 | int insert(const char **, int = -1, int = 0); |
58 | int insert(const char *, Basemenu *, int = -1); | 58 | int insert(const char *, Basemenu *, int = -1); |
59 | int remove(unsigned int item); | 59 | int remove(unsigned int item); |
diff --git a/src/Screen.cc b/src/Screen.cc index 816c869..1870e3e 100644 --- a/src/Screen.cc +++ b/src/Screen.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: Screen.cc,v 1.38 2002/03/23 15:14:45 fluxgen Exp $ | 25 | // $Id: Screen.cc,v 1.39 2002/03/27 18:47:12 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -696,7 +696,7 @@ void BScreen::addIcon(FluxboxWindow *w) { | |||
696 | 696 | ||
697 | iconList.push_back(w); | 697 | iconList.push_back(w); |
698 | 698 | ||
699 | iconmenu->insert((const char **) w->getIconTitle()); | 699 | iconmenu->insert(w->getIconTitle()); |
700 | iconmenu->update(); | 700 | iconmenu->update(); |
701 | toolbar->addIcon(w); | 701 | toolbar->addIcon(w); |
702 | } | 702 | } |