another fix for HP-UX 11.11 vsscanf, should have been in r51260

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index cfd9427eb359a31a4818d66f210cccfdbd5cd8b7..62906a470948f9f76fb09baf0657f46655b6a5d2 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -143,19 +143,19 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)

-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );

 }
 
 extern "C" {
 
 }
 
 extern "C" {
 

-static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu )
+static void gtk_menu_open_callback( GtkWidget *WXUNUSED(widget), wxMenu *menu )

 {
     wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
 
     DoCommonMenuCallbackCode(menu, event);
 }
 
 {
     wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
 
     DoCommonMenuCallbackCode(menu, event);
 }
 

-static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar )
+static void gtk_menu_close_callback( GtkWidget *WXUNUSED(widget), wxMenuBar *menubar )

 {
     if ( !menubar->GetMenuCount() )
     {
 {
     if ( !menubar->GetMenuCount() )
     {


@@ -632,7 +632,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(menu);
 
             commandEvent.SetInt(item->IsChecked());
         commandEvent.SetEventObject(menu);
 

-        frame->GetEventHandler()->ProcessEvent(commandEvent);
+        frame->HandleWindowEvent(commandEvent);

     }
     else
     {
     }
     else
     {


@@ -666,7 +666,7 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
         return;
 
     wxWindow *win = menu->GetInvokingWindow();
         return;
 
     wxWindow *win = menu->GetInvokingWindow();

-    if (win) win->GetEventHandler()->ProcessEvent( event );
+    if (win) win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -695,7 +695,7 @@ static void gtk_menu_nolight_callback( GtkWidget *widget, wxMenu *menu )
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)
 
     wxWindow *win = menu->GetInvokingWindow();
     if (win)

-        win->GetEventHandler()->ProcessEvent( event );
+        win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -1030,7 +1030,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     }
     else if (mitem->GetBitmap().Ok())
     {
     }
     else if (mitem->GetBitmap().Ok())
     {

-        text = mitem->wxMenuItembase::GetItemLabel();
+        text = mitem->wxMenuItemBase::GetItemLabel();

         const wxBitmap *bitmap = &mitem->GetBitmap();
 
         // TODO
         const wxBitmap *bitmap = &mitem->GetBitmap();
 
         // TODO