typo fix

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 7f4d87855ddfec40c5d8444d1dc961f3638cffc9..9f8004024621c945631536f2eff7a6d30a77172f 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -55,14 +55,12 @@ static wxString GetGtkHotKey( const wxMenuItem& item );
 
 static wxString wxReplaceUnderscore( const wxString& title )
 {
 
 static wxString wxReplaceUnderscore( const wxString& title )
 {

-    const wxChar *pc;
-

     // GTK 1.2 wants to have "_" instead of "&" for accelerators
     wxString str;
     // GTK 1.2 wants to have "_" instead of "&" for accelerators
     wxString str;

-    pc = title;
-    while (*pc != wxT('\0'))
+
+    for ( wxString::const_iterator pc = title.begin(); pc != title.end(); ++pc )

     {
     {

-        if ((*pc == wxT('&')) && (*(pc+1) == wxT('&')))
+        if ((*pc == wxT('&')) && (pc+1 != title.end()) && (*(pc+1) == wxT('&')))

         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;
         {
             // "&" is doubled to indicate "&" instead of accelerator
             ++pc;


@@ -83,7 +81,6 @@ static wxString wxReplaceUnderscore( const wxString& title )
 
             str << *pc;
         }
 
             str << *pc;
         }

-        ++pc;

     }
 
     // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );
     }
 
     // wxPrintf( wxT("before %s after %s\n"), title.c_str(), str.c_str() );


@@ -97,9 +94,6 @@ static wxString wxReplaceUnderscore( const wxString& title )
 
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {
 
 static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();
     event.SetEventObject( menu );
 
     wxEvtHandler* handler = menu->GetEventHandler();


@@ -143,13 +137,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar,wxWindow)
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {
 
 void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long style)
 {

-    // the parent window is known after wxFrame::SetMenu()
-    m_needParent = false;

     m_style = style;
     m_style = style;

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

 
 

-    if (!PreCreation( (wxWindow*) NULL, wxDefaultPosition, wxDefaultSize ) ||
-        !CreateBase( (wxWindow*) NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))
+    if (!PreCreation( NULL, wxDefaultPosition, wxDefaultSize ) ||
+        !CreateBase( NULL, -1, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("menubar") ))

     {
         wxFAIL_MSG( wxT("wxMenuBar creation failed") );
         return;
     {
         wxFAIL_MSG( wxT("wxMenuBar creation failed") );
         return;


@@ -160,12 +152,12 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     if (style & wxMB_DOCKABLE)
     {
         m_widget = gtk_handle_box_new();
     if (style & wxMB_DOCKABLE)
     {
         m_widget = gtk_handle_box_new();

-        gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_menubar) );
-        gtk_widget_show( GTK_WIDGET(m_menubar) );
+        gtk_container_add(GTK_CONTAINER(m_widget), m_menubar);
+        gtk_widget_show(m_menubar);

     }
     else
     {
     }
     else
     {

-        m_widget = GTK_WIDGET(m_menubar);
+        m_widget = m_menubar;

     }
 
     PostCreation();
     }
 
     PostCreation();


@@ -560,9 +552,6 @@ void wxMenuBar::SetLabelTop( size_t pos, const wxString& label )
 extern "C" {
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
 extern "C" {
 static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */
     int id = menu->FindMenuIdByMenuItem(widget);
 
     /* should find it for normal (not popup) menu */


@@ -637,8 +626,6 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 extern "C" {
 static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 {
 extern "C" {
 static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!
     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!


@@ -665,8 +652,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
 extern "C" {
 static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 {
 extern "C" {
 static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!
     int id = menu->FindMenuIdByMenuItem(widget);
 
     wxASSERT( id != -1 ); // should find it!


@@ -833,7 +818,7 @@ void wxMenuItem::SetText( const wxString& str )
         gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
         if (accel_key != 0)
         {
         gtk_accelerator_parse( (const char*) oldbuf, &accel_key, &accel_mods);
         if (accel_key != 0)
         {

-            gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+            gtk_widget_remove_accelerator(m_menuItem,

                                         m_parentMenu->m_accel,
                                         accel_key,
                                         accel_mods );
                                         m_parentMenu->m_accel,
                                         accel_key,
                                         accel_mods );


@@ -843,7 +828,7 @@ void wxMenuItem::SetText( const wxString& str )
     {
         // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
         if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
     {
         // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
         if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))

-            gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+            gtk_widget_remove_accelerator( m_menuItem,

                                            m_parentMenu->m_accel,
                                            accel_key,
                                            accel_mods );
                                            m_parentMenu->m_accel,
                                            accel_key,
                                            accel_mods );


@@ -856,7 +841,7 @@ void wxMenuItem::SetText( const wxString& str )
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
         if (accel_key != 0)
         {
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
         if (accel_key != 0)
         {

-            gtk_widget_add_accelerator( GTK_WIDGET(m_menuItem),
+            gtk_widget_add_accelerator( m_menuItem,

                                         "activate",
                                         m_parentMenu->m_accel,
                                         accel_key,
                                         "activate",
                                         m_parentMenu->m_accel,
                                         accel_key,


@@ -868,7 +853,7 @@ void wxMenuItem::SetText( const wxString& str )
     {
         // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
         if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
     {
         // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
         if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))

-            gtk_widget_remove_accelerator( GTK_WIDGET(m_menuItem),
+            gtk_widget_remove_accelerator( m_menuItem,

                                            m_parentMenu->m_accel,
                                            accel_key,
                                            accel_mods );
                                            m_parentMenu->m_accel,
                                            accel_key,
                                            accel_mods );


@@ -1030,6 +1015,8 @@ wxMenu::~wxMenu()
    {
        // see wxMenu::Init
        gtk_widget_unref( m_menu );
    {
        // see wxMenu::Init
        gtk_widget_unref( m_menu );

+       g_object_unref( m_accel );
+       

        // if the menu is inserted in another menu at this time, there was
        // one more reference to it:
        if ( m_owner )
        // if the menu is inserted in another menu at this time, there was
        // one more reference to it:
        if ( m_owner )


@@ -1174,7 +1161,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
         if (accel_key != 0)
         {
         gtk_accelerator_parse( (const char*) buf, &accel_key, &accel_mods);
         if (accel_key != 0)
         {

-            gtk_widget_add_accelerator (GTK_WIDGET(menuItem),
+            gtk_widget_add_accelerator (menuItem,

                                         "activate",
                                         m_accel,
                                         accel_key,
                                         "activate",
                                         m_accel,
                                         accel_key,


@@ -1186,7 +1173,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     {
         // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
         if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))
     {
         // if the accelerator was taken from a stock ID, just get it back from GTK+ stock
         if (wxGetStockGtkAccelerator(stockid, &accel_mods, &accel_key))

-            gtk_widget_add_accelerator( GTK_WIDGET(menuItem),
+            gtk_widget_add_accelerator( menuItem,

                                         "activate",
                                         m_accel,
                                         accel_key,
                                         "activate",
                                         m_accel,
                                         accel_key,


@@ -1362,10 +1349,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:
                 hotkey << wxT("Down" );
                 break;
             case WXK_PAGEUP:

-                hotkey << wxT("PgUp" );
+                hotkey << wxT("Page_Up" );

                 break;
             case WXK_PAGEDOWN:
                 break;
             case WXK_PAGEDOWN:

-                hotkey << wxT("PgDn" );
+                hotkey << wxT("Page_Down" );

                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );
                 break;
             case WXK_LEFT:
                 hotkey << wxT("Left" );


@@ -1483,10 +1470,10 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:
                 hotkey << wxT("KP_Down" );
                 break;
             case WXK_NUMPAD_PAGEUP:

-                hotkey << wxT("KP_PgUp" );
+                hotkey << wxT("KP_Page_Up" );

                 break;
             case WXK_NUMPAD_PAGEDOWN:
                 break;
             case WXK_NUMPAD_PAGEDOWN:

-                hotkey << wxT("KP_PgDn" );
+                hotkey << wxT("KP_Page_Down" );

                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );
                 break;
             case WXK_NUMPAD_END:
                 hotkey << wxT("KP_End" );


@@ -1547,8 +1534,9 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
             default:
                 if ( code < 127 )
                 {
             default:
                 if ( code < 127 )
                 {

-                    wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
-                    if ( name )
+                    const wxString
+                        name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code));
+                    if ( !name.empty() )

                     {
                         hotkey << name;
                         break;
                     {
                         hotkey << name;
                         break;