Added scrollbar size to settings

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 4852879086a200f51c3acca5822c08f870a2c06e..11d281273ed14f7c51bf8971bbbcffdb99533213 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -2,15 +2,14 @@
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        menu.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

 // Id:          $Id$
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifdef __GNUG__
 #pragma implementation "menu.h"
 #ifdef __GNUG__
 #pragma implementation "menu.h"

+#pragma implementation "menuitem.h"

 #endif
 
 #include "wx/menu.h"
 #endif
 
 #include "wx/menu.h"


@@ -32,7 +31,7 @@ wxMenuBar::wxMenuBar()
   m_menus.DeleteContents( TRUE );
 
   m_menubar = gtk_menu_bar_new();
   m_menus.DeleteContents( TRUE );
 
   m_menubar = gtk_menu_bar_new();

-  
+

   m_widget = GTK_WIDGET(m_menubar);
 
   PostCreation();
   m_widget = GTK_WIDGET(m_menubar);
 
   PostCreation();


@@ -153,14 +152,15 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
   int id = menu->FindMenuIdByMenuItem(widget);
 
 {
   int id = menu->FindMenuIdByMenuItem(widget);
 

-  wxASSERT( id != -1 ); // should find it!
+  // should find it for normal (not popup) menu
+  wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 

 
   if (!menu->IsEnabled(id)) return;
 
   wxCommandEvent event( wxEVT_COMMAND_MENU_SELECTED, id );
   event.SetEventObject( menu );
   event.SetInt(id );
 
   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);
   if (menu->m_callback)
   {
      (void) (*(menu->m_callback)) (*menu, event);


@@ -188,7 +188,7 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
   wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
   event.SetEventObject( menu );
   event.SetInt(id );
   wxCommandEvent event( wxEVT_MENU_HIGHLIGHT, id );
   event.SetEventObject( menu );
   event.SetInt(id );

-  
+

 /* wxMSW doesn't call callback here either
   if (menu->m_callback)
   {
 /* wxMSW doesn't call callback here either
   if (menu->m_callback)
   {


@@ -204,7 +204,7 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxMenu
+// wxMenuItem

 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem,wxObject)


@@ -219,33 +219,48 @@ wxMenuItem::wxMenuItem()
   m_menuItem = (GtkWidget *) NULL;
 }
 
   m_menuItem = (GtkWidget *) NULL;
 }
 

-void wxMenuItem::SetText(const wxString& str)
+// it's valid for this function to be called even if m_menuItem == NULL
+void wxMenuItem::SetName(const wxString& str)

 {
   m_text = "";
 {
   m_text = "";

-  for ( const char *pc = str; *pc != '\0'; pc++ ) {
+  for ( const char *pc = str; *pc != '\0'; pc++ )
+  {

     if ( *pc == '&' )
       pc++; // skip it
 
     m_text << *pc;
   }
     if ( *pc == '&' )
       pc++; // skip it
 
     m_text << *pc;
   }

+
+  if ( m_menuItem )
+  {
+    GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
+
+    gtk_label_set( label, m_text.c_str());
+  }

 }
 
 void wxMenuItem::Check( bool check )
 {
 }
 
 void wxMenuItem::Check( bool check )
 {

+  wxCHECK_RET( m_menuItem, "invalid menu item" );
+

   wxCHECK_RET( IsCheckable(), "Can't check uncheckable item!" )
 
   m_isChecked = check;
   gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
 }
 
   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 ) 
-{ 
+void wxMenuItem::Enable( bool enable )
+{
+  wxCHECK_RET( m_menuItem, "invalid menu item" );
+

   gtk_widget_set_sensitive( m_menuItem, enable );
   gtk_widget_set_sensitive( m_menuItem, enable );

-  m_isEnabled = enable; 
+  m_isEnabled = enable;

 }
 
 bool wxMenuItem::IsChecked() const
 {
 }
 
 bool wxMenuItem::IsChecked() const
 {

+  wxCHECK_MSG( m_menuItem, FALSE, "invalid menu item" );
+

   wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
   bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;
   wxCHECK( IsCheckable(), FALSE ); // can't get state of uncheckable item!
 
   bool bIsChecked = ((GtkCheckMenuItem*)m_menuItem)->active != 0;


@@ -255,6 +270,10 @@ bool wxMenuItem::IsChecked() const
   return bIsChecked;
 }
 
   return bIsChecked;
 }
 

+//-----------------------------------------------------------------------------
+// wxMenuItem
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 wxMenu::wxMenu( const wxString& title, const wxFunction func )
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 wxMenu::wxMenu( const wxString& title, const wxFunction func )


@@ -263,8 +282,11 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
   m_items.DeleteContents( TRUE );
   m_invokingWindow = (wxWindow *) NULL;
   m_menu = gtk_menu_new();  // Do not show!
   m_items.DeleteContents( TRUE );
   m_invokingWindow = (wxWindow *) NULL;
   m_menu = gtk_menu_new();  // Do not show!

+

   m_callback = func;
   m_eventHandler = this;
   m_callback = func;
   m_eventHandler = this;

+  m_clientData = (void*) NULL;
+

   if (m_title.IsNull()) m_title = "";
   if (m_title != "")
   {
   if (m_title.IsNull()) m_title = "";
   if (m_title != "")
   {


@@ -306,7 +328,7 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool
   const char *text = mitem->GetText();
   GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text)
                                   : gtk_menu_item_new_with_label(text);
   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",
   mitem->SetMenuItem(menuItem);
 
   gtk_signal_connect( GTK_OBJECT(menuItem), "activate",


@@ -444,7 +466,9 @@ wxMenuItem *wxMenu::FindItem(int id) const
     node = node->Next();
   }
 
     node = node->Next();
   }
 

-  wxLogDebug( "wxMenu::FindItem: item %d not found.", id);
+  // Not finding anything here can be correct
+  // when search the entire menu system for
+  // an entry -> no error message.

 
   return (wxMenuItem *) NULL;
 }
 
   return (wxMenuItem *) NULL;
 }