Commit 30c6c78c authored by dickelbeck's avatar dickelbeck

fixes

parent 1d3b8714
...@@ -52,46 +52,46 @@ ...@@ -52,46 +52,46 @@
#define EXCHG(a,b) { typeof(a) __temp__ = (a); (a) = (b); (b) = __temp__; } #define EXCHG(a,b) { typeof(a) __temp__ = (a); (a) = (b); (b) = __temp__; }
/* macro for insert menuitems with a icon: */ /* macro for insert menuitems with a icon: */
#define ADD_MENUITEM(menu, id, text, icon) {\ #define ADD_MENUITEM(menu, id, text, icon) do {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text);\ l_item = new wxMenuItem(menu, id, text);\
l_item->SetBitmap(icon); menu->Append(l_item);} l_item->SetBitmap(icon); menu->Append(l_item);} while(0)
#define ADD_MENUITEM_WITH_HELP(menu, id, text, help, icon) {\ #define ADD_MENUITEM_WITH_HELP(menu, id, text, help, icon) do {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text, help);\ l_item = new wxMenuItem(menu, id, text, help);\
l_item->SetBitmap(icon); menu->Append(l_item);} l_item->SetBitmap(icon); menu->Append(l_item);} while(0)
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#define ADD_MENUITEM_WITH_SUBMENU(menu, submenu, id, text, icon) {\ #define ADD_MENUITEM_WITH_SUBMENU(menu, submenu, id, text, icon) do {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text);\ l_item = new wxMenuItem(menu, id, text);\
l_item->SetSubMenu(submenu);\ l_item->SetSubMenu(submenu);\
l_item->SetBitmap(icon);\ l_item->SetBitmap(icon);\
l_item->SetFont(* g_ItalicFont);\ l_item->SetFont(* g_ItalicFont);\
menu->Append(l_item);} menu->Append(l_item);} while(0)
#define ADD_MENUITEM_WITH_HELP_AND_SUBMENU(menu, submenu, id, text, help, icon) {\ #define ADD_MENUITEM_WITH_HELP_AND_SUBMENU(menu, submenu, id, text, help, icon) do {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text, help);\ l_item = new wxMenuItem(menu, id, text, help);\
l_item->SetSubMenu(submenu);\ l_item->SetSubMenu(submenu);\
l_item->SetBitmap(icon);\ l_item->SetBitmap(icon);\
l_item->SetFont(*g_ItalicFont);\ l_item->SetFont(*g_ItalicFont);\
menu->Append(l_item);} menu->Append(l_item);} while(0)
#else #else
#define ADD_MENUITEM_WITH_SUBMENU(menu, submenu, id, text, icon) {\ #define ADD_MENUITEM_WITH_SUBMENU(menu, submenu, id, text, icon) do {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text);\ l_item = new wxMenuItem(menu, id, text);\
l_item->SetSubMenu(submenu);\ l_item->SetSubMenu(submenu);\
l_item->SetBitmap(icon);\ l_item->SetBitmap(icon);\
menu->Append(l_item);} menu->Append(l_item);} while(0)
#define ADD_MENUITEM_WITH_HELP_AND_SUBMENU(menu, submenu, id, text, help, icon) {\ #define ADD_MENUITEM_WITH_HELP_AND_SUBMENU(menu, submenu, id, text, help, icon) do {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text, help);\ l_item = new wxMenuItem(menu, id, text, help);\
l_item->SetSubMenu(submenu);\ l_item->SetSubMenu(submenu);\
l_item->SetBitmap(icon);\ l_item->SetBitmap(icon);\
menu->Append(l_item);} menu->Append(l_item);} while(0)
#endif #endif
#ifdef __WINDOWS__ #ifdef __WINDOWS__
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment