Rewrite. Cursor handling better, split Layout() and Draw(), faster.

[wxWidgets.git] / src / gtk1 / menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 39204142f1e4910a7278ae0d1c658c8d7a983363..7bf133ec47b3b53c81b8eff35166600f161e2633 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -27,7 +27,7 @@ wxMenuBar::wxMenuBar()
 {
   m_needParent = FALSE; // hmmm
 
-  PreCreation( NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+  PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
 
   m_menus.DeleteContents( TRUE );
 
@@ -150,7 +150,7 @@ bool wxMenuBar::Enabled( int id ) const
 }
 
 //-----------------------------------------------------------------------------
-// wxMenu
+// "activate"
 //-----------------------------------------------------------------------------
 
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
@@ -161,7 +161,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
   if (!menu->IsEnabled(id)) return;
 
-  wxCommandEvent event( wxEVENT_TYPE_MENU_COMMAND, id );
+  wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
   event.SetEventObject( menu );
   event.SetInt(id );
   
@@ -177,6 +177,40 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
   if (win) win->GetEventHandler()->ProcessEvent( event );
 }
 
+//-----------------------------------------------------------------------------
+// "select"
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
+{
+  int id = menu->FindMenuIdByMenuItem(widget);
+
+  wxASSERT( id != -1 ); // should find it!
+
+  if (!menu->IsEnabled(id)) return;
+
+  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->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxMenu
+//-----------------------------------------------------------------------------
+
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 
 wxMenuItem::wxMenuItem()
@@ -185,8 +219,8 @@ wxMenuItem::wxMenuItem()
   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)
@@ -202,7 +236,7 @@ void wxMenuItem::SetText(const wxString& str)
 
 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 );
@@ -231,7 +265,7 @@ 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;
@@ -243,6 +277,17 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
   }
 }
 
+void wxMenu::SetTitle( const wxString& title )
+{
+  // Waiting for something better.
+  m_title = title;
+}
+
+const wxString wxMenu::GetTitle() const
+{
+  return m_title;
+}
+
 void wxMenu::AppendSeparator()
 {
   wxMenuItem *mitem = new wxMenuItem();
@@ -272,6 +317,10 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
                       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 );
@@ -399,9 +448,9 @@ wxMenuItem *wxMenu::FindItem(int id) const
     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 )