adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some string cleanup

Browse Source
This commit is contained in:
ADAM David Alan Martin
2025-08-10 23:14:32 -04:00
parent 47d9c7eaa0
commit 143f1f7d2d
4 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dw/fltkui.cc
View File

@ -1502,11 +1502,11 @@ void FltkOptionMenuResource::setItem (int index, bool selected)
((Fl_Choice *)widget)->value(menu+index);
}
void FltkOptionMenuResource::pushGroup (const char *name, bool enabled)
void FltkOptionMenuResource::pushGroup (const std::string &name, bool enabled)
{
Fl_Menu_Item *item = newItem();
item->text = dStrdup(name);
item->text = dStrdup( name.c_str() );
if (enabled == false)
item->flags = FL_MENU_INACTIVE;
@ -1628,11 +1628,11 @@ void FltkListResource::widgetCallback (Fl_Widget *widget, void *data)
}
}
void *FltkListResource::newItem (const char *str, bool enabled, bool selected)
void *FltkListResource::newItem (const std::string &str, bool enabled, bool selected)
{
Fl_Browser *b = (Fl_Browser *) widget;
int index = b->size() + 1;
char *label = (char *)malloc(strlen(str) + 1 + currDepth + 4),
char *label = (char *)malloc(str.size() + 1 + currDepth + 4),
*s = label;
memset(s, '\a', currDepth);
@ -1646,7 +1646,7 @@ void *FltkListResource::newItem (const char *str, bool enabled, bool selected)
*s++ = '@';
*s++ = '.';
strcpy(s, str);
strcpy(s, str.c_str());
b->add(label);
free(label);
@ -1689,18 +1689,18 @@ void FltkListResource::setItem (int index, bool selected)
b->select(index + 1, selected);
}
void FltkListResource::pushGroup (const char *name, bool enabled)
void FltkListResource::pushGroup (const std::string &name_, bool enabled)
{
bool en = false;
bool selected = false;
auto name= name_;
// Fl_Browser_::incr_height() for item height won't do the right thing if
// the first item doesn't have anything to it.
if (!name || !*name)
name = " ";
if( name.empty() ) name= " ";
// TODO: Proper disabling of item groups
newItem(name, en, selected);
newItem(name.c_str(), en, selected);
if (currDepth < 3)
currDepth++;

8
dw/fltkui.hh
View File

@ -456,7 +456,7 @@ protected:
virtual bool setSelectedItems() { return false; }
virtual void addItem (const char *str, bool enabled, bool selected) = 0;
virtual void setItem (int index, bool selected) = 0;
virtual void pushGroup (const char *name, bool enabled) = 0;
virtual void pushGroup( const std::string &name, bool enabled ) = 0;
virtual void popGroup () = 0;
public:
FltkSelectionResource (FltkPlatform *platform) :
@ -486,7 +486,7 @@ public:
void addItem (const char *str, bool enabled, bool selected);
void setItem (int index, bool selected);
void pushGroup (const char *name, bool enabled);
void pushGroup( const std::string &name, bool enabled ) override;
void popGroup ();
void sizeRequest (core::Requisition *requisition);
@ -503,7 +503,7 @@ protected:
int getMaxItemWidth ();
private:
static void widgetCallback (Fl_Widget *widget, void *data);
void *newItem (const char *str, bool enabled, bool selected);
void *newItem (const std::string &str, bool enabled, bool selected);
int currDepth;
int colWidths[4];
int showRows;
@ -516,7 +516,7 @@ public:
void addItem (const char *str, bool enabled, bool selected);
void setItem (int index, bool selected);
void pushGroup (const char *name, bool enabled);
void pushGroup( const std::string &name, bool enabled ) override;
void popGroup ();
void sizeRequest (core::Requisition *requisition);

2
dw/ui.hh
View File

@ -468,7 +468,7 @@ class SelectionResource: public Resource
public:
virtual void addItem (const char *str, bool enabled, bool selected) = 0;
virtual void setItem (int index, bool selected) = 0;
virtual void pushGroup (const char *name, bool enabled) = 0;
virtual void pushGroup( const std::string &name, bool enabled ) = 0;
virtual void popGroup () = 0;
virtual int getNumberOfItems () = 0;