#include "wx/menu.h"
#include "wx/log.h"
+#include "wx/intl.h"
//-----------------------------------------------------------------------------
// wxMenuBar
{
m_needParent = FALSE; // hmmm
- PreCreation( NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+ PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
m_menus.DeleteContents( TRUE );
- m_widget = gtk_handle_box_new();
-
m_menubar = gtk_menu_bar_new();
-
- gtk_container_add( GTK_CONTAINER(m_widget), m_menubar );
-
- gtk_widget_show( m_menubar );
+
+ m_widget = GTK_WIDGET(m_menubar);
PostCreation();
Show( TRUE );
-};
+}
void wxMenuBar::Append( wxMenu *menu, const wxString &title )
{
m_menus.Append( menu );
menu->m_title = title; // ??????
- size_t pos;
+ int pos;
do {
pos = menu->m_title.First( '&' );
- if (pos != wxString::npos) menu->m_title.Remove( pos, 1 );
- } while (pos != wxString::npos);
+ if (pos != -1) menu->m_title.Remove( pos, 1 );
+ } while (pos != -1);
GtkWidget *root_menu;
root_menu = gtk_menu_item_new_with_label( WXSTRINGCAST(menu->m_title) );
gtk_menu_item_set_submenu( GTK_MENU_ITEM(root_menu), menu->m_menu );
gtk_menu_bar_append( GTK_MENU_BAR(m_menubar), root_menu );
-};
+}
static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
{
{
int res = menu->FindItem( itemString );
if (res != -1) return res;
- };
+ }
wxNode *node = menu->m_items.First();
while (node)
{
if (item->IsSubMenu())
return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
node = node->Next();
- };
+ }
return -1;
-};
+}
int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
{
int res = FindMenuItemRecursive( menu, menuString, itemString);
if (res != -1) return res;
node = node->Next();
- };
+ }
return -1;
-};
+}
// Find a wxMenuItem using its id. Recurses down into sub-menus
static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
if ( item->IsSubMenu() )
result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
node = node->Next();
- };
+ }
return result;
-};
+}
wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
{
return result;
}
-bool wxMenuBar::IsChecked( int id ) const
+void wxMenuBar::Check( int id, bool check )
+{
+ wxMenuItem* item = FindMenuItemById( id );
+ if (item) item->Check(check);
+}
+
+bool wxMenuBar::Checked( int id ) const
{
wxMenuItem* item = FindMenuItemById( id );
if (item) return item->IsChecked();
return FALSE;
}
-bool wxMenuBar::IsEnabled( int id ) const
+void wxMenuBar::Enable( int id, bool enable )
+{
+ wxMenuItem* item = FindMenuItemById( id );
+ if (item) item->Enable(enable);
+}
+
+bool wxMenuBar::Enabled( int id ) const
{
wxMenuItem* item = FindMenuItemById( id );
if (item) return item->IsEnabled();
}
//-----------------------------------------------------------------------------
-// wxMenu
+// "activate"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
+{
+ int id = menu->FindMenuIdByMenuItem(widget);
+
+ wxASSERT( id != -1 ); // should find it!
+
+ if (!menu->IsEnabled(id)) return;
+
+ wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
+ event.SetEventObject( menu );
+ event.SetInt(id );
+
+ if (menu->m_callback)
+ {
+ (void) (*(menu->m_callback)) (*menu, event);
+ return;
+ }
+
+ if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
+ wxWindow *win = menu->GetInvokingWindow();
+ if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// "select"
//-----------------------------------------------------------------------------
-void gtk_menu_clicked_callback( GtkWidget *widget, gpointer data )
+static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
{
- wxMenu *menu = (wxMenu*)data;
int id = menu->FindMenuIdByMenuItem(widget);
wxASSERT( id != -1 ); // should find it!
- if (!menu->IsEnabled(id))
- return;
+ if (!menu->IsEnabled(id)) return;
- wxCommandEvent event( wxEVENT_TYPE_MENU_COMMAND, id );
+ wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu );
event.SetInt(id );
+
+/* wxMSW doesn't call callback here either
+ if (menu->m_callback)
+ {
+ (void) (*(menu->m_callback)) (*menu, event);
+ return;
+ }
+*/
+
+ if (menu->GetEventHandler()->ProcessEvent(event)) return;
+
wxWindow *win = menu->GetInvokingWindow();
- if (win) win->ProcessEvent( event );
-};
+ if (win) win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxMenu
+//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
m_isCheckMenu = FALSE;
m_isChecked = FALSE;
m_isEnabled = TRUE;
- m_subMenu = NULL;
- m_menuItem = NULL;
-};
+ m_subMenu = (wxMenu *) NULL;
+ m_menuItem = (GtkWidget *) NULL;
+}
void wxMenuItem::SetText(const wxString& str)
{
+ m_text = "";
for ( const char *pc = str; *pc != '\0'; pc++ ) {
if ( *pc == '&' )
pc++; // skip it
void wxMenuItem::Check( bool check )
{
- wxCHECK_RET( IsCheckable(), "can't check uncheckable item!" )
+ wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
m_isChecked = check;
gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
}
+void wxMenuItem::Enable( bool enable )
+{
+ gtk_widget_set_sensitive( m_menuItem, enable );
+ m_isEnabled = enable;
+}
+
bool wxMenuItem::IsChecked() const
{
wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
-wxMenu::wxMenu( const wxString &title )
+wxMenu::wxMenu( const wxString& title, const wxFunction func )
{
m_title = title;
m_items.DeleteContents( TRUE );
- m_invokingWindow = NULL;
+ m_invokingWindow = (wxWindow *) NULL;
m_menu = gtk_menu_new(); // Do not show!
-};
+ m_callback = func;
+ m_eventHandler = this;
+ if (m_title.IsNull()) m_title = "";
+ if (m_title != "")
+ {
+ Append(-2, m_title);
+ AppendSeparator();
+ }
+}
+
+void wxMenu::SetTitle( const wxString& title )
+{
+ // Waiting for something better.
+ m_title = title;
+}
+
+const wxString wxMenu::GetTitle() const
+{
+ return m_title;
+}
void wxMenu::AppendSeparator()
{
gtk_widget_show( menuItem );
mitem->SetMenuItem(menuItem);
m_items.Append( mitem );
-};
+}
void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{
wxMenuItem *mitem = new wxMenuItem();
mitem->SetId(id);
mitem->SetText(item);
- mitem->SetHelpString(helpStr);
+ mitem->SetHelp(helpStr);
mitem->SetCheckable(checkable);
const char *text = mitem->GetText();
GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text)
: gtk_menu_item_new_with_label(text);
+
mitem->SetMenuItem(menuItem);
gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer*)this );
+ gtk_signal_connect( GTK_OBJECT(menuItem), "select",
+ GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
+ (gpointer*)this );
+
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
m_items.Append( mitem );
-};
+}
void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )
{
mitem->SetText(text);
GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
- mitem->SetHelpString(helpStr);
+ mitem->SetHelp(helpStr);
mitem->SetMenuItem(menuItem);
mitem->SetSubMenu(subMenu);
gtk_menu_append( GTK_MENU(m_menu), menuItem );
gtk_widget_show( menuItem );
m_items.Append( mitem );
-};
+}
int wxMenu::FindItem( const wxString itemString ) const
{
wxString s( itemString );
- size_t pos;
+ int pos;
do {
pos = s.First( '&' );
- if (pos != wxString::npos) s.Remove( pos, 1 );
- } while (pos != wxString::npos);
+ if (pos != -1) s.Remove( pos, 1 );
+ } while (pos != -1);
wxNode *node = m_items.First();
while (node)
if (item->GetText() == s)
return item->GetId();
node = node->Next();
- };
+ }
return -1;
-};
+}
void wxMenu::Enable( int id, bool enable )
{
wxMenuItem *item = FindItem(id);
if ( item )
item->Enable(enable);
-};
+}
bool wxMenu::IsEnabled( int id ) const
{
return item->IsEnabled();
else
return FALSE;
-};
+}
void wxMenu::Check( int id, bool enable )
{
wxMenuItem *item = FindItem(id);
if ( item )
item->Check(enable);
-};
+}
bool wxMenu::IsChecked( int id ) const
{
return item->IsChecked();
else
return FALSE;
-};
+}
void wxMenu::SetLabel( int id, const wxString &label )
{
wxMenuItem *item = FindItem(id);
- if ( item )
+ if (item)
item->SetText(label);
-};
+}
+
+wxString wxMenu::GetLabel( int id ) const
+{
+ wxMenuItem *item = FindItem(id);
+ if (item) return item->GetText();
+ return "";
+}
+
+void wxMenu::SetHelpString( int id, const wxString& helpString )
+{
+ wxMenuItem *item = FindItem(id);
+ if (item) item->SetHelp( helpString );
+}
+
+wxString wxMenu::GetHelpString( int id ) const
+{
+ wxMenuItem *item = FindItem(id);
+ if (item) return item->GetHelp();
+ return "";
+}
int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{
if (item->GetMenuItem() == menuItem)
return item->GetId();
node = node->Next();
- };
+ }
return -1;
-};
+}
wxMenuItem *wxMenu::FindItem(int id) const
{
if ( item->GetId() == id )
return item;
node = node->Next();
- };
+ }
- wxLogDebug("wxMenu::FindItem: item %d not found.", id);
+ wxLogDebug( "wxMenu::FindItem: item %d not found.", id);
- return NULL;
+ return (wxMenuItem *) NULL;
}
void wxMenu::SetInvokingWindow( wxWindow *win )
{
m_invokingWindow = win;
-};
+}
wxWindow *wxMenu::GetInvokingWindow()
{
return m_invokingWindow;
-};
+}
projects / wxWidgets.git / blobdiff