Fixed yet another error in my wxCmdLineParser mdifications.

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 5c1a0eb2855d727798be2039c18e375b329f991e..d74c9b2ca6211f0f7df9ac2ff81baffdb2c3d4ad 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -110,21 +110,32 @@ void       gtk_pixmap_menu_item_set_pixmap     (GtkPixmapMenuItem *menu_item,
 static wxString wxReplaceUnderscore( const wxString& title )
 {
     const wxChar *pc;
 static wxString wxReplaceUnderscore( const wxString& title )
 {
     const wxChar *pc;

-    
+

     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;
     for ( pc = title; *pc != wxT('\0'); pc++ )
     {
         if (*pc == wxT('&'))
         {
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
     wxString str;
     for ( pc = title; *pc != wxT('\0'); pc++ )
     {
         if (*pc == wxT('&'))
         {

-#if GTK_CHECK_VERSION(1, 2, 1)
+#if GTK_CHECK_VERSION(1, 2, 0)

             str << wxT('_');
             str << wxT('_');

+#endif
+        }
+#if GTK_CHECK_VERSION(2, 0, 0)
+        else if (*pc == wxT('/'))
+        {
+            str << wxT("\\/");

         }
         }

+        else if (*pc == wxT('\\'))
+        {
+            str << wxT("\\\\");
+        }
+#elif GTK_CHECK_VERSION(1, 2, 0)

         else if (*pc == wxT('/'))
         {
             str << wxT('\\');
         else if (*pc == wxT('/'))
         {
             str << wxT('\\');

-#endif

         }
         }

+#endif

         else
         {
 #if __WXGTK12__
         else
         {
 #if __WXGTK12__


@@ -621,21 +632,25 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 
     if (item->IsCheckable())
     {
 
     if (item->IsCheckable())
     {

-        bool isReallyChecked = item->IsChecked();
-        if ( item->wxMenuItemBase::IsChecked() == isReallyChecked )
+        bool isReallyChecked = item->IsChecked(),
+             isInternallyChecked = item->wxMenuItemBase::IsChecked();
+
+        // ensure that the internal state is always consistent with what is
+        // shown on the screen
+        item->wxMenuItemBase::Check(isReallyChecked);
+
+        // we must not report the events for the radio button going up nor the
+        // events resulting from the calls to wxMenuItem::Check()
+        if ( (item->GetKind() == wxITEM_RADIO && !isReallyChecked) ||
+             (isInternallyChecked == isReallyChecked) )

         {
         {

-            /* the menu item has been checked by calling wxMenuItem->Check() */

             return;
         }
             return;
         }

-        else
-        {
-            /* the user pressed on the menu item -> report and make consistent
-             * again */
-            item->wxMenuItemBase::Check(isReallyChecked);
-        }
+
+        // the user pressed on the menu item: report the event below

     }
 
     }
 

-    menu->SendEvent(item->GetId(), item->IsCheckable() ? item->IsChecked() : -1);
+    menu->SendEvent(id, item->IsCheckable() ? item->IsChecked() : -1);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -712,6 +727,23 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        wxItemKind kind,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)
                        wxItemKind kind,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help, kind, subMenu)

+{
+    Init(text);
+}
+
+wxMenuItem::wxMenuItem(wxMenu *parentMenu,
+                       int id,
+                       const wxString& text,
+                       const wxString& help,
+                       bool isCheckable,
+                       wxMenu *subMenu)
+          : wxMenuItemBase(parentMenu, id, text, help,
+                           isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
+{
+    Init(text);
+}
+
+void wxMenuItem::Init(const wxString& text)

 {
     m_labelWidget = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;
 {
     m_labelWidget = (GtkWidget *) NULL;
     m_menuItem = (GtkWidget *) NULL;


@@ -729,7 +761,7 @@ wxMenuItem::~wxMenuItem()
 wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {
     wxString label;
 wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {
     wxString label;

-    
+

     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
         if ( *pc == wxT('_')  )
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
         if ( *pc == wxT('_')  )


@@ -739,7 +771,7 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
             label += *pc;
             continue;
         }
             label += *pc;
             continue;
         }

-        
+

         if ( *pc == wxT('&') )
         {
             // wxMSW escapes &
         if ( *pc == wxT('&') )
         {
             // wxMSW escapes &


@@ -754,6 +786,14 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 
 void wxMenuItem::SetText( const wxString& str )
 {
 
 void wxMenuItem::SetText( const wxString& str )
 {

+    // Some optimization to avoid flicker
+    wxString oldLabel = m_text;
+    oldLabel = wxStripMenuCodes(oldLabel.BeforeFirst('\t'));
+    oldLabel.Replace(wxT("_"), wxT(""));
+    wxString label1 = wxStripMenuCodes(str.BeforeFirst('\t'));
+    if (oldLabel == label1)
+        return;
+    

     DoSetText(str);
 
     if (m_menuItem)
     DoSetText(str);
 
     if (m_menuItem)


@@ -781,20 +821,35 @@ void wxMenuItem::DoSetText( const wxString& str )
     const wxChar *pc = str;
     for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
     {
     const wxChar *pc = str;
     for (; (*pc != wxT('\0')) && (*pc != wxT('\t')); pc++ )
     {

+#if GTK_CHECK_VERSION(1, 2, 0)

         if (*pc == wxT('&'))
         {
         if (*pc == wxT('&'))
         {

-#if GTK_CHECK_VERSION(1, 2, 0)

             m_text << wxT('_');
         }
         else if ( *pc == wxT('_') )    // escape underscores
         {
             m_text << wxT("__");
         }
             m_text << wxT('_');
         }
         else if ( *pc == wxT('_') )    // escape underscores
         {
             m_text << wxT("__");
         }

+#else // GTK+ < 1.2.0
+        if (*pc == wxT('&'))
+        {
+        }
+#endif
+#if GTK_CHECK_VERSION(2, 0, 0)
+        else if (*pc == wxT('/'))      // we have to escape slashes
+        {
+            m_text << wxT("\\/");
+        }
+        else if (*pc == wxT('\\'))     // we have to double backslashes
+        {
+            m_text << wxT("\\\\");
+        }
+#elif GTK_CHECK_VERSION(1, 2, 0)

         else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
         {
             m_text << wxT('\\');  /* ... and replace them with back slashes */
         else if (*pc == wxT('/'))      /* we have to filter out slashes ... */
         {
             m_text << wxT('\\');  /* ... and replace them with back slashes */

-#endif // GTK+ 1.2.0+

         }
         }

+#endif

         else
             m_text << *pc;
     }
         else
             m_text << *pc;
     }


@@ -834,17 +889,20 @@ void wxMenuItem::Check( bool check )
 {
     wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
 
 {
     wxCHECK_RET( m_menuItem, wxT("invalid menu item") );
 

-    wxCHECK_RET( IsCheckable(), wxT("Can't check uncheckable item!") )
-

     if (check == m_isChecked)
         return;
 
     wxMenuItemBase::Check( check );
 
     if (check == m_isChecked)
         return;
 
     wxMenuItemBase::Check( check );
 

-    // GTK+ does it itself for the radio item
-    if ( GetKind() == wxITEM_CHECK )
+    switch ( GetKind() )

     {
     {

-        gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+        case wxITEM_CHECK:
+        case wxITEM_RADIO:
+            gtk_check_menu_item_set_state( (GtkCheckMenuItem*)m_menuItem, (gint)check );
+            break;
+
+        default:
+            wxFAIL_MSG( _T("can't check this item") );

     }
 }
 
     }
 }
 


@@ -879,10 +937,10 @@ wxString wxMenuItem::GetFactoryPath() const
             // remove '_' and '&' unconditionally
             continue;
         }
             // remove '_' and '&' unconditionally
             continue;
         }

-        
+

         path += *pc;
     }
         path += *pc;
     }

-    
+

     return path;
 }
 
     return path;
 }
 


@@ -947,8 +1005,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 #endif
 
 #if GTK_CHECK_VERSION(1, 2, 0)
 #endif
 
 #if GTK_CHECK_VERSION(1, 2, 0)

-    // is this a radio item?
-    bool isRadio = FALSE;
+    // does this item terminate the current radio group?
+    bool endOfRadioGroup = TRUE;

 #endif // GTK+ >= 1.2
 
     if ( mitem->IsSeparator() )
 #endif // GTK+ >= 1.2
 
     if ( mitem->IsSeparator() )


@@ -965,6 +1023,9 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 
         /* this will be wrong for more than one separator. do we care? */
         menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );
 
         /* this will be wrong for more than one separator. do we care? */
         menuItem = gtk_item_factory_get_widget( m_factory, "<main>/sep" );

+
+        // we might have a separator inside a radio group
+        endOfRadioGroup = FALSE;

 #else // GTK+ 1.0
         menuItem = gtk_menu_item_new();
 #endif // GTK 1.2/1.0
 #else // GTK+ 1.0
         menuItem = gtk_menu_item_new();
 #endif // GTK 1.2/1.0


@@ -1008,7 +1069,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
     {
         wxString text( mitem->GetText() );
         const wxBitmap *bitmap = &mitem->GetBitmap();
     {
         wxString text( mitem->GetText() );
         const wxBitmap *bitmap = &mitem->GetBitmap();

-    
+

         menuItem = gtk_pixmap_menu_item_new ();
         GtkWidget *label = gtk_accel_label_new (text.mb_str());
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         menuItem = gtk_pixmap_menu_item_new ();
         GtkWidget *label = gtk_accel_label_new (text.mb_str());
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);


@@ -1080,9 +1141,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
                     item_type = pathRadio;
                 }
 
                     item_type = pathRadio;
                 }
 

-                // remember that this one was a radio item to avoid resetting
-                // m_pathLastRadio below
-                isRadio = TRUE;
+                // continue the existing radio group, if any
+                endOfRadioGroup = FALSE;

                 break;
 
             default:
                 break;
 
             default:


@@ -1145,7 +1205,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
     mitem->SetMenuItem(menuItem);
 
 #if GTK_CHECK_VERSION(1, 2, 0)
     mitem->SetMenuItem(menuItem);
 
 #if GTK_CHECK_VERSION(1, 2, 0)

-    if ( !isRadio )
+    if ( endOfRadioGroup )

     {
         m_pathLastRadio.clear();
     }
     {
         m_pathLastRadio.clear();
     }


@@ -1255,7 +1315,7 @@ static wxString GetHotKey( const wxMenuItem& item )
             case WXK_F12:
                 hotkey << wxT('F') << code - WXK_F1 + 1;
                 break;
             case WXK_F12:
                 hotkey << wxT('F') << code - WXK_F1 + 1;
                 break;

-                
+

                 // TODO: we should use gdk_keyval_name() (a.k.a.
                 //       XKeysymToString) here as well as hardcoding the keysym
                 //       names this might be not portable
                 // TODO: we should use gdk_keyval_name() (a.k.a.
                 //       XKeysymToString) here as well as hardcoding the keysym
                 //       names this might be not portable


@@ -1389,7 +1449,7 @@ gtk_pixmap_menu_item_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
         (GtkClassInitFunc) NULL,
       };
 

-      pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (), 
+      pixmap_menu_item_type = gtk_type_unique (gtk_menu_item_get_type (),

                                               &pixmap_menu_item_info);
     }
 
                                               &pixmap_menu_item_info);
     }
 


@@ -1399,7 +1459,7 @@ gtk_pixmap_menu_item_get_type (void)
 /**
  * gtk_pixmap_menu_item_new
  *
 /**
  * gtk_pixmap_menu_item_new
  *

- * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap() 
+ * Creates a new pixmap menu item. Use gtk_pixmap_menu_item_set_pixmap()

  * to set the pixmap wich is displayed at the left side.
  *
  * Returns:
  * to set the pixmap wich is displayed at the left side.
  *
  * Returns:


@@ -1461,7 +1521,7 @@ gtk_pixmap_menu_item_draw (GtkWidget    *widget,
   if (GTK_WIDGET_CLASS (parent_class)->draw)
     (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
 
   if (GTK_WIDGET_CLASS (parent_class)->draw)
     (* GTK_WIDGET_CLASS (parent_class)->draw) (widget, area);
 

-  if (GTK_WIDGET_DRAWABLE (widget) && 
+  if (GTK_WIDGET_DRAWABLE (widget) &&

       GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
     gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
   }
       GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
     gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
   }


@@ -1478,7 +1538,7 @@ gtk_pixmap_menu_item_expose (GtkWidget      *widget,
   if (GTK_WIDGET_CLASS (parent_class)->expose_event)
     (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
 
   if (GTK_WIDGET_CLASS (parent_class)->expose_event)
     (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
 

-  if (GTK_WIDGET_DRAWABLE (widget) && 
+  if (GTK_WIDGET_DRAWABLE (widget) &&

       GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
     gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
   }
       GTK_PIXMAP_MENU_ITEM(widget)->pixmap) {
     gtk_widget_draw(GTK_WIDGET(GTK_PIXMAP_MENU_ITEM(widget)->pixmap),NULL);
   }


@@ -1511,8 +1571,8 @@ gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
   if (GTK_WIDGET_REALIZED (pixmap->parent) &&
       !GTK_WIDGET_REALIZED (pixmap))
     gtk_widget_realize (pixmap);
   if (GTK_WIDGET_REALIZED (pixmap->parent) &&
       !GTK_WIDGET_REALIZED (pixmap))
     gtk_widget_realize (pixmap);

-  
-  if (GTK_WIDGET_VISIBLE (pixmap->parent)) {      
+
+  if (GTK_WIDGET_VISIBLE (pixmap->parent)) {

     if (GTK_WIDGET_MAPPED (pixmap->parent) &&
        GTK_WIDGET_VISIBLE(pixmap) &&
         !GTK_WIDGET_MAPPED (pixmap))
     if (GTK_WIDGET_MAPPED (pixmap->parent) &&
        GTK_WIDGET_VISIBLE(pixmap) &&
         !GTK_WIDGET_MAPPED (pixmap))


@@ -1520,7 +1580,7 @@ gtk_pixmap_menu_item_set_pixmap (GtkPixmapMenuItem *menu_item,
   }
 
   changed_have_pixmap_status(menu_item);
   }
 
   changed_have_pixmap_status(menu_item);

-  
+

   if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
     gtk_widget_queue_resize (pixmap);
 }
   if (GTK_WIDGET_VISIBLE (pixmap) && GTK_WIDGET_VISIBLE (menu_item))
     gtk_widget_queue_resize (pixmap);
 }


@@ -1606,7 +1666,7 @@ gtk_pixmap_menu_item_size_request (GtkWidget      *widget,
   GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
 
   menu_item = GTK_PIXMAP_MENU_ITEM (widget);
   GTK_WIDGET_CLASS(parent_class)->size_request(widget,requisition);
 
   menu_item = GTK_PIXMAP_MENU_ITEM (widget);

-  
+

   if (menu_item->pixmap)
     gtk_widget_size_request(menu_item->pixmap, &req);
 
   if (menu_item->pixmap)
     gtk_widget_size_request(menu_item->pixmap, &req);
 


@@ -1627,19 +1687,19 @@ gtk_pixmap_menu_item_remove (GtkContainer *container,
   g_return_if_fail (GTK_IS_WIDGET (child));
 
   bin = GTK_BIN (container);
   g_return_if_fail (GTK_IS_WIDGET (child));
 
   bin = GTK_BIN (container);

-  g_return_if_fail ((bin->child == child || 
+  g_return_if_fail ((bin->child == child ||

                     (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
 
   widget_was_visible = GTK_WIDGET_VISIBLE (child);
                     (GTK_PIXMAP_MENU_ITEM(container)->pixmap == child)));
 
   widget_was_visible = GTK_WIDGET_VISIBLE (child);

-  
+

   gtk_widget_unparent (child);
   if (bin->child == child)
   gtk_widget_unparent (child);
   if (bin->child == child)

-    bin->child = NULL; 
+    bin->child = NULL;

   else {
     GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
     changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
   }
   else {
     GTK_PIXMAP_MENU_ITEM(container)->pixmap = NULL;
     changed_have_pixmap_status(GTK_PIXMAP_MENU_ITEM(container));
   }

-    
+

   if (widget_was_visible)
     gtk_widget_queue_resize (GTK_WIDGET (container));
 }
   if (widget_was_visible)
     gtk_widget_queue_resize (GTK_WIDGET (container));
 }


@@ -1661,7 +1721,7 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
 
     if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
       /* Install normal toggle size */
 
     if (GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->have_pixmap_count == 0) {
       /* Install normal toggle size */

-      GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;    
+      GTK_MENU_ITEM_GET_CLASS(menu_item)->toggle_size = GTK_PIXMAP_MENU_ITEM_GET_CLASS(menu_item)->orig_toggle_size;

     }
   }
 
     }
   }
 


@@ -1670,7 +1730,7 @@ changed_have_pixmap_status (GtkPixmapMenuItem *menu_item)
      this function is called, we get the same effect, just because of
      how the preferences option to show pixmaps works. Bogus, broken.
   */
      this function is called, we get the same effect, just because of
      how the preferences option to show pixmaps works. Bogus, broken.
   */

-  if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item))) 
+  if (GTK_WIDGET_VISIBLE(GTK_WIDGET(menu_item)))

     gtk_widget_queue_resize(GTK_WIDGET(menu_item));
 }
 
     gtk_widget_queue_resize(GTK_WIDGET(menu_item));
 }