summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2005-03-18 06:29:11 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2005-03-18 06:29:11 +0000
commita218f44b5db233bbbd588b5766ec6f3e5e6cb822 (patch)
tree8a57e704f0e9fe849ca04478890561a26cd832d7 /src
parent1e742cc41f169d97790bba4f63b7a56db8a66455 (diff)
Bug fixes and UI tweaking...
src/Fl_Menu_.cxx: - Fl_Menu_::find_item(): wasn't checking for a non-NULL label()... fluid/alignment_panel.*: fluid/widget_panel.*: - Use small controls, normalize layout. - Add FLTK header/footer comments. fluid/Fluid_Image.cxx: - Use relative paths for images. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4127 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Menu_.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx
index 01605458e..26af47618 100644
--- a/src/Fl_Menu_.cxx
+++ b/src/Fl_Menu_.cxx
@@ -52,10 +52,10 @@ int Fl_Menu_::item_pathname(char *name, int namelen, const Fl_Menu_Item *findite
for ( int t=0; t<size(); t++ ) {
const Fl_Menu_Item *m = &(menu()[t]);
if ( m->submenu() ) { // submenu? descend
- if ( *name ) SAFE_STRCAT("/");
- SAFE_STRCAT(m->label());
+ if (*name) SAFE_STRCAT("/");
+ if (m->label()) SAFE_STRCAT(m->label());
} else {
- if ( m->label() ) { // menu item?
+ if (m->label()) { // menu item?
if ( m == finditem ) { // found? tack on itemname, done.
SAFE_STRCAT("/");
SAFE_STRCAT(m->label());