/* the parent window is known after wxFrame::SetMenu() */
m_needParent = FALSE;
m_style = style;
+ m_invokingWindow = (wxWindow*) NULL;
- PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, style, "menu" );
+ if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+ !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
+ {
+ wxFAIL_MSG( wxT("wxMenuBar creation failed") );
+ return;
+ }
m_menus.DeleteContents( TRUE );
/* the parent window is known after wxFrame::SetMenu() */
m_needParent = FALSE;
m_style = 0;
+ m_invokingWindow = (wxWindow*) NULL;
- PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
-
+ if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
+ !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, wxT("menubar") ))
+ {
+ wxFAIL_MSG( wxT("wxMenuBar creation failed") );
+ return;
+ }
+
m_menus.DeleteContents( TRUE );
/* GTK 1.2.0 doesn't have gtk_item_factory_get_item(), but GTK 1.2.1 has. */
wxMenuBar::~wxMenuBar()
{
- // how to destroy a GtkItemFactory ?
+// gtk_object_unref( GTK_OBJECT(m_factory) ); why not ?
}
static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
void wxMenuBar::SetInvokingWindow( wxWindow *win )
{
+ m_invokingWindow = win;
#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
wxWindow *top_frame = win;
while (top_frame->GetParent())
void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
{
+ m_invokingWindow = (wxWindow*) NULL;
#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
wxWindow *top_frame = win;
while (top_frame->GetParent())
/* GTK 1.2 wants to have "_" instead of "&" for accelerators */
wxString str;
- for ( pc = title; *pc != _T('\0'); pc++ )
+ for ( pc = title; *pc != wxT('\0'); pc++ )
{
- if (*pc == _T('&'))
+ if (*pc == wxT('&'))
{
#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
- str << _T('_');
- } else
- if (*pc == _T('/'))
+ str << wxT('_');
+ }
+ else if (*pc == wxT('/'))
{
- str << _T('\\');
+ str << wxT('\\');
#endif
}
else
- str << *pc;
+ {
+#if __WXGTK12__
+ if ( *pc == wxT('_') )
+ {
+ // underscores must be doubled to prevent them from being
+ // interpreted as accelerator character prefix by GTK
+ str << *pc;
+ }
+#endif // GTK+ 1.2
+
+ str << *pc;
+ }
}
/* this doesn't have much effect right now */
/* local buffer in multibyte form */
wxString buf;
- buf << '/' << str.mb_str();
- char *cbuf = new char[buf.Length()];
+ buf << wxT('/') << str.c_str();
+
+ char *cbuf = new char[buf.Length()+1];
+ strcpy(cbuf, buf.mbc_str());
+
GtkItemFactoryEntry entry;
- entry.path = (gchar *)buf.c_str(); // const_cast
+ entry.path = (gchar *)cbuf; // const_cast
entry.accelerator = (gchar*) NULL;
entry.callback = (GtkItemFactoryCallback) NULL;
entry.callback_action = 0;
gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
/* in order to get the pointer to the item we need the item text _without_ underscores */
- wxString tmp = _T("<main>/");
- for ( pc = str; *pc != _T('\0'); pc++ )
+ wxString tmp = wxT("<main>/");
+ for ( pc = str; *pc != wxT('\0'); pc++ )
{
- if (*pc == _T('_')) pc++; /* skip it */
+ // contrary to the common sense, we must throw out _all_ underscores,
+ // (i.e. "Hello__World" => "HelloWorld" and not "Hello_World" as we
+ // might naively think). IMHO it's a bug in GTK+ (VZ)
+ while (*pc == wxT('_'))
+ pc++;
tmp << *pc;
}
menu->m_owner = gtk_item_factory_get_item( m_factory, tmp.mb_str() );
gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), menu->m_owner );
#endif
+
+ // m_invokingWindow is set after wxFrame::SetMenuBar(). This call enables
+ // adding menu later on.
+ if (m_invokingWindow)
+ wxMenubarSetInvokingWindow( menu, m_invokingWindow );
}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, _T("wxMenuBar::Check: no such item") );
+ wxCHECK_RET( item, wxT("wxMenuBar::Check: no such item") );
item->Check(check);
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsChecked: no such item") );
+ wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked: no such item") );
return item->IsChecked();
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, _T("wxMenuBar::Enable: no such item") );
+ wxCHECK_RET( item, wxT("wxMenuBar::Enable: no such item") );
item->Enable(enable);
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, FALSE, _T("wxMenuBar::IsEnabled: no such item") );
+ wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled: no such item") );
return item->IsEnabled();
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetLabel: no such item") );
+ wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetLabel: no such item") );
return item->GetText();
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, _T("wxMenuBar::SetLabel: no such item") );
+ wxCHECK_RET( item, wxT("wxMenuBar::SetLabel: no such item") );
item->SetText( label );
}
{
wxNode *node = m_menus.Nth( pos );
- wxCHECK_RET( node, _T("menu not found") );
+ wxCHECK_RET( node, wxT("menu not found") );
wxMenu* menu = (wxMenu*)node->Data();
{
wxNode *node = m_menus.Nth( pos );
- wxCHECK_MSG( node, _T("invalid"), _T("menu not found") );
+ wxCHECK_MSG( node, wxT("invalid"), wxT("menu not found") );
wxMenu* menu = (wxMenu*)node->Data();
{
wxNode *node = m_menus.Nth( pos );
- wxCHECK_RET( node, _T("menu not found") );
+ wxCHECK_RET( node, wxT("menu not found") );
wxMenu* menu = (wxMenu*)node->Data();
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_RET( item, _T("wxMenuBar::SetHelpString: no such item") );
+ wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString: no such item") );
item->SetHelp( helpString );
}
{
wxMenuItem* item = FindMenuItemById( id );
- wxCHECK_MSG( item, _T(""), _T("wxMenuBar::GetHelpString: no such item") );
+ wxCHECK_MSG( item, wxT(""), wxT("wxMenuBar::GetHelpString: no such item") );
return item->GetHelp();
}
return;
wxMenuItem* item = menu->FindItem( id );
- wxCHECK_RET( item, _T("error in menu item callback") );
+ wxCHECK_RET( item, wxT("error in menu item callback") );
if (item->IsCheckable())
{
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu );
-/* wxMSW doesn't call callback here either
-
- if (menu->m_callback)
- {
- (void) (*(menu->m_callback)) (*menu, event);
- return;
- }
-*/
-
if (menu->GetEventHandler()->ProcessEvent(event))
return;
m_menuItem = (GtkWidget *) NULL;
}
+wxMenuItem::~wxMenuItem()
+{
+ // don't delete menu items, the menus take care of that
+}
+
// it's valid for this function to be called even if m_menuItem == NULL
void wxMenuItem::SetName( const wxString& str )
{
/* '\t' is the deliminator indicating a hot key */
- m_text = _T("");
+ m_text = wxT("");
const wxChar *pc = str;
- for (; (*pc != _T('\0')) && (*pc != _T('\t')); pc++ )
+ for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
{
- if (*pc == _T('&'))
+ if (*pc == wxT('&'))
{
#if (GTK_MINOR_VERSION > 0)
- m_text << _T('_');
- } else
- if (*pc == _T('/')) /* we have to filter out slashes ... */
+ m_text << wxT('_');
+ }
+ else if ( *pc == wxT('_') ) // escape underscores
+ {
+ m_text << wxT("__");
+ }
+ else if (*pc == wxT('/')) /* we have to filter out slashes ... */
{
- m_text << _T('\\'); /* ... and replace them with back slashes */
+ m_text << wxT('\\'); /* ... and replace them with back slashes */
#endif
}
else
}
/* only GTK 1.2 knows about hot keys */
- m_hotKey = _T("");
+ m_hotKey = wxT("");
#if (GTK_MINOR_VERSION > 0)
- if(*pc == _T('\t'))
+ if(*pc == wxT('\t'))
{
pc++;
m_hotKey = pc;
void wxMenuItem::Check( bool check )
{
- wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+ wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
- wxCHECK_RET( IsCheckable(), _T("Can't check uncheckable item!") )
+ wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") )
if (check == m_isChecked) return;
void wxMenuItem::Enable( bool enable )
{
- wxCHECK_RET( m_menuItem, _T("invalid menu item") );
+ wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
gtk_widget_set_sensitive( m_menuItem, enable );
m_isEnabled = enable;
bool wxMenuItem::IsChecked() const
{
- wxCHECK_MSG( m_menuItem, FALSE, _T("invalid menu item") );
+ wxCHECK_MSG( m_menuItem, FALSE, wxT("invalid menu item") );
wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
-{
- Init(title, func, style);
-}
-
-wxMenu::wxMenu(long style)
-{
- Init(wxEmptyString, (wxFunction) NULL, style);
-}
-
void
-wxMenu::Init( const wxString& title, const wxFunction func, long style )
+wxMenu::Init( const wxString& title,
+ long style,
+ const wxFunction func
+ )
{
m_title = title;
m_items.DeleteContents( TRUE );
#endif
m_callback = func;
+
m_eventHandler = this;
m_clientData = (void*) NULL;
- if (m_title.IsNull()) m_title = _T("");
- if (m_title != _T(""))
+ if (m_title.IsNull()) m_title = wxT("");
+ if (m_title != wxT(""))
{
Append(-2, m_title);
AppendSeparator();
wxMenu::~wxMenu()
{
- /* how do we delete an item-factory ? */
+ wxNode *node = m_items.First();
+ while (node)
+ {
+ wxMenuItem *item = (wxMenuItem*)node->Data();
+ wxMenu *submenu = item->GetSubMenu();
+ if (submenu)
+ delete submenu;
+ node = node->Next();
+ }
+
+ gtk_widget_destroy( m_menu );
+
+ gtk_object_unref( GTK_OBJECT(m_factory) );
}
void wxMenu::SetTitle( const wxString& title )
m_items.Append( mitem );
}
+#if (GTK_MINOR_VERSION > 0)
static char* GetHotKey( const wxString &hotkey, char *hotbuf )
{
if (hotkey.IsEmpty()) return (char*) NULL;
switch (hotkey[0])
{
- case _T('a'): /* Alt */
- case _T('A'):
- case _T('m'): /* Meta */
- case _T('M'):
+ case wxT('a'): /* Alt */
+ case wxT('A'):
+ case wxT('m'): /* Meta */
+ case wxT('M'):
{
strcpy( hotbuf, "<alt>" );
wxString last = hotkey.Right(1);
strcat( hotbuf, last.mb_str() );
return hotbuf;
}
- case _T('c'): /* Ctrl */
- case _T('C'):
- case _T('s'): /* Strg, yeah man, I'm German */
- case _T('S'):
+ case wxT('c'): /* Ctrl */
+ case wxT('C'):
+ case wxT('s'): /* Strg, yeah man, I'm German */
+ case wxT('S'):
{
strcpy( hotbuf, "<control>" );
wxString last = hotkey.Right(1);
strcat( hotbuf, last.mb_str() );
return hotbuf;
}
- case _T('F'): /* function keys */
+ case wxT('F'): /* function keys */
{
strcpy( hotbuf, hotkey.mb_str() );
return hotbuf;
}
return (char*) NULL;
}
+#endif
void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{
gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
/* in order to get the pointer to the item we need the item text _without_ underscores */
- wxString s = _T("<main>/");
- for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+ wxString s = wxT("<main>/");
+ for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
{
- if (*pc == _T('_')) pc++; /* skip it */
+ while (*pc == wxT('_')) pc++; /* skip it */
s << *pc;
}
gtk_item_factory_create_item( m_factory, &entry, (gpointer) this, 2 ); /* what is 2 ? */
/* in order to get the pointer to the item we need the item text _without_ underscores */
- wxString s = _T("<main>/");
- for ( const wxChar *pc = text; *pc != _T('\0'); pc++ )
+ wxString s = wxT("<main>/");
+ for ( const wxChar *pc = text; *pc != wxT('\0'); pc++ )
{
- if (*pc == _T('_')) pc++; /* skip it */
+ if (*pc == wxT('_')) pc++; /* skip it */
s << *pc;
}
item->SetMenuItem(menuItem);
}
+void wxMenu::Delete( int id )
+{
+ wxNode *node = m_items.First();
+ while (node)
+ {
+ wxMenuItem *item = (wxMenuItem*)node->Data();
+ if (item->GetId() == id)
+ {
+ gtk_widget_destroy( item->GetMenuItem() );
+ m_items.DeleteNode( node );
+ return;
+ }
+ node = node->Next();
+ }
+}
+
int wxMenu::FindItem( const wxString itemString ) const
{
- wxString s = _T("");
- for ( const wxChar *pc = itemString; *pc != _T('\0'); pc++ )
+ wxString s = wxT("");
+ for ( const wxChar *pc = itemString; *pc != wxT('\0'); pc++ )
{
- if (*pc == _T('&'))
+ if (*pc == wxT('&'))
{
pc++; /* skip it */
#if (GTK_MINOR_VERSION > 0)
- s << _T('_');
+ s << wxT('_');
#endif
}
s << *pc;
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, _T("wxMenu::Enable: no such item") );
+ wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
item->Enable(enable);
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, FALSE, _T("wxMenu::IsEnabled: no such item") );
+ wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") );
return item->IsEnabled();
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, _T("wxMenu::Check: no such item") );
+ wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
item->Check(enable);
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, FALSE, _T("wxMenu::IsChecked: no such item") );
+ wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") );
return item->IsChecked();
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, _T("wxMenu::SetLabel: no such item") );
+ wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
item->SetText(label);
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, _T(""), _T("wxMenu::GetLabel: no such item") );
+ wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") );
return item->GetText();
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_RET( item, _T("wxMenu::SetHelpString: no such item") );
+ wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
item->SetHelp( helpString );
}
{
wxMenuItem *item = FindItem(id);
- wxCHECK_MSG( item, _T(""), _T("wxMenu::GetHelpString: no such item") );
+ wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") );
return item->GetHelp();
}
projects / wxWidgets.git / blobdiff