Updates to memcheck

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 752968ab3f1051a6b915d7901ec24e747306f7dd..7bf133ec47b3b53c81b8eff35166600f161e2633 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -15,6 +15,7 @@
 
 #include "wx/menu.h"
 #include "wx/log.h"
 
 #include "wx/menu.h"
 #include "wx/log.h"

+#include "wx/intl.h"

 
 //-----------------------------------------------------------------------------
 // wxMenuBar
 
 //-----------------------------------------------------------------------------
 // wxMenuBar


@@ -26,7 +27,7 @@ wxMenuBar::wxMenuBar()
 {
   m_needParent = FALSE; // hmmm
 
 {
   m_needParent = FALSE; // hmmm
 

-  PreCreation( NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );
+  PreCreation( (wxWindow *) NULL, -1, wxDefaultPosition, wxDefaultSize, 0, "menu" );

 
   m_menus.DeleteContents( TRUE );
 
 
   m_menus.DeleteContents( TRUE );
 


@@ -41,7 +42,7 @@ wxMenuBar::wxMenuBar()
   PostCreation();
 
   Show( TRUE );
   PostCreation();
 
   Show( TRUE );

-};
+}

 
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
 
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {


@@ -60,7 +61,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &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 );
   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 )
 {
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
 {


@@ -68,7 +69,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
   {
     int res = menu->FindItem( itemString );
     if (res != -1) return res;
   {
     int res = menu->FindItem( itemString );
     if (res != -1) return res;

-  };
+  }

   wxNode *node = menu->m_items.First();
   while (node)
   {
   wxNode *node = menu->m_items.First();
   while (node)
   {


@@ -76,9 +77,9 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
     if (item->IsSubMenu())
       return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
     node = node->Next();
     if (item->IsSubMenu())
       return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
     node = node->Next();

-  };
+  }

   return -1;
   return -1;

-};
+}

 
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
 {
 
 int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemString ) const
 {


@@ -89,9 +90,9 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr
     int res = FindMenuItemRecursive( menu, menuString, itemString);
     if (res != -1) return res;
     node = node->Next();
     int res = FindMenuItemRecursive( menu, menuString, itemString);
     if (res != -1) return res;
     node = node->Next();

-  };
+  }

   return -1;
   return -1;

-};
+}

 
 // Find a wxMenuItem using its id. Recurses down into sub-menus
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 
 // Find a wxMenuItem using its id. Recurses down into sub-menus
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)


@@ -104,10 +105,10 @@ static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
     if ( item->IsSubMenu() )
       result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
     node = node->Next();
     if ( item->IsSubMenu() )
       result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
     node = node->Next();

-  };
+  }

 
   return result;
 
   return result;

-};
+}

 
 wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
 {
 
 wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
 {


@@ -122,14 +123,26 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
   return result;
 }
 
   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;
 }
 
 {
   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();
 {
   wxMenuItem* item = FindMenuItemById( id );
   if (item) return item->IsEnabled();


@@ -137,25 +150,66 @@ bool wxMenuBar::IsEnabled( int id ) const
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxMenu
+// "activate"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void gtk_menu_clicked_callback( GtkWidget *widget, gpointer data )
+static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )

 {
 {

-  wxMenu *menu = (wxMenu*)data;

   int id = menu->FindMenuIdByMenuItem(widget);
 
   wxASSERT( id != -1 ); // should find it!
 
   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_COMMAND_MENU_SELECTED, id );

   event.SetEventObject( menu );
   event.SetInt(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 );
   wxWindow *win = menu->GetInvokingWindow();
   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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 


@@ -165,12 +219,13 @@ wxMenuItem::wxMenuItem()
   m_isCheckMenu = FALSE;
   m_isChecked = FALSE;
   m_isEnabled = TRUE;
   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)
 {
 
 void wxMenuItem::SetText(const wxString& str)
 {

+  m_text = "";

   for ( const char *pc = str; *pc != '\0'; pc++ ) {
     if ( *pc == '&' )
       pc++; // skip it
   for ( const char *pc = str; *pc != '\0'; pc++ ) {
     if ( *pc == '&' )
       pc++; // skip it


@@ -181,12 +236,18 @@ void wxMenuItem::SetText(const wxString& str)
 
 void wxMenuItem::Check( bool check )
 {
 
 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 );
 }
 
 
   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!
 bool wxMenuItem::IsChecked() const
 {
   wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!


@@ -200,13 +261,32 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 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_title = title;
   m_items.DeleteContents( TRUE );

-  m_invokingWindow = NULL;
+  m_invokingWindow = (wxWindow *) NULL;

   m_menu = gtk_menu_new();  // Do not show!
   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()
 {
 
 void wxMenu::AppendSeparator()
 {


@@ -218,28 +298,33 @@ void wxMenu::AppendSeparator()
   gtk_widget_show( menuItem );
   mitem->SetMenuItem(menuItem);
   m_items.Append( mitem );
   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);
 
 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->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 );
 
   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 );
   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 )
 {
 
 void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxString &helpStr )
 {


@@ -248,7 +333,7 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri
   mitem->SetText(text);
 
   GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText());
   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);
 
   mitem->SetMenuItem(menuItem);
   mitem->SetSubMenu(subMenu);
 


@@ -256,7 +341,7 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri
   gtk_menu_append( GTK_MENU(m_menu), menuItem );
   gtk_widget_show( menuItem );
   m_items.Append( mitem );
   gtk_menu_append( GTK_MENU(m_menu), menuItem );
   gtk_widget_show( menuItem );
   m_items.Append( mitem );

-};
+}

 
 int wxMenu::FindItem( const wxString itemString ) const
 {
 
 int wxMenu::FindItem( const wxString itemString ) const
 {


@@ -275,17 +360,17 @@ int wxMenu::FindItem( const wxString itemString ) const
     if (item->GetText() == s)
       return item->GetId();
     node = node->Next();
     if (item->GetText() == s)
       return item->GetId();
     node = node->Next();

-  };
+  }

 
   return -1;
 
   return -1;

-};
+}

 
 void wxMenu::Enable( int id, bool enable )
 {
   wxMenuItem *item = FindItem(id);
   if ( item )
     item->Enable(enable);
 
 void wxMenu::Enable( int id, bool enable )
 {
   wxMenuItem *item = FindItem(id);
   if ( item )
     item->Enable(enable);

-};
+}

 
 bool wxMenu::IsEnabled( int id ) const
 {
 
 bool wxMenu::IsEnabled( int id ) const
 {


@@ -294,14 +379,14 @@ bool wxMenu::IsEnabled( int id ) const
     return item->IsEnabled();
   else
     return FALSE;
     return item->IsEnabled();
   else
     return FALSE;

-};
+}

 
 void wxMenu::Check( int id, bool enable )
 {
   wxMenuItem *item = FindItem(id);
   if ( item )
     item->Check(enable);
 
 void wxMenu::Check( int id, bool enable )
 {
   wxMenuItem *item = FindItem(id);
   if ( item )
     item->Check(enable);

-};
+}

 
 bool wxMenu::IsChecked( int id ) const
 {
 
 bool wxMenu::IsChecked( int id ) const
 {


@@ -310,14 +395,34 @@ bool wxMenu::IsChecked( int id ) const
     return item->IsChecked();
   else
     return FALSE;
     return item->IsChecked();
   else
     return FALSE;

-};
+}

 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
   wxMenuItem *item = FindItem(id);
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
   wxMenuItem *item = FindItem(id);

-  if ( item )
+  if (item)

     item->SetText(label);
     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
 {
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {


@@ -328,10 +433,10 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
     if (item->GetMenuItem() == menuItem)
       return item->GetId();
     node = node->Next();
     if (item->GetMenuItem() == menuItem)
       return item->GetId();
     node = node->Next();

-  };
+  }

 
   return -1;
 
   return -1;

-};
+}

 
 wxMenuItem *wxMenu::FindItem(int id) const
 {
 
 wxMenuItem *wxMenu::FindItem(int id) const
 {


@@ -341,21 +446,21 @@ wxMenuItem *wxMenu::FindItem(int id) const
     if ( item->GetId() == id )
       return item;
     node = node->Next();
     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;
 }
 
 void wxMenu::SetInvokingWindow( wxWindow *win )
 {
   m_invokingWindow = win;

-};
+}

 
 wxWindow *wxMenu::GetInvokingWindow()
 {
   return m_invokingWindow;
 
 wxWindow *wxMenu::GetInvokingWindow()
 {
   return m_invokingWindow;

-};
+}