compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 78a429d06587c7a1ae202b4ae9ada5b18164bc0c..c4398fa1687ca4ed32e399d79c0cb89368eee7f4 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -120,10 +120,9 @@ public:
 #endif
     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {
 #endif
     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {

-        Init(title, style, NULL);
+        Init(title, style);

     }
 
     }
 

-    wxMenu( long style );

     ~wxMenu();
 
     // operations
     ~wxMenu();
 
     // operations


@@ -203,7 +202,7 @@ private:
     void Init( const wxString& title,
                long style
 #ifdef WXWIN_COMPATIBILITY
     void Init( const wxString& title,
                long style
 #ifdef WXWIN_COMPATIBILITY

-               , const wxFunction func
+               , const wxFunction func = (wxFunction) NULL

 #endif
                );
 
 #endif
                );
 

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 78a429d06587c7a1ae202b4ae9ada5b18164bc0c..c4398fa1687ca4ed32e399d79c0cb89368eee7f4 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -120,10 +120,9 @@ public:
 #endif
     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {
 #endif
     wxMenu( const wxString& title = wxEmptyString, long style = 0 )
     {

-        Init(title, style, NULL);
+        Init(title, style);

     }
 
     }
 

-    wxMenu( long style );

     ~wxMenu();
 
     // operations
     ~wxMenu();
 
     // operations


@@ -203,7 +202,7 @@ private:
     void Init( const wxString& title,
                long style
 #ifdef WXWIN_COMPATIBILITY
     void Init( const wxString& title,
                long style
 #ifdef WXWIN_COMPATIBILITY

-               , const wxFunction func
+               , const wxFunction func = (wxFunction) NULL

 #endif
                );
 
 #endif
                );
 

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index b65cb80df0f8d3571afb8b5ae2bd579c2e415fe0..87122a4e3aa0090f788caa66d56f1136c868624e 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -155,8 +155,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetIcon(wxICON(mondrian));
 
     // create a menu bar
     SetIcon(wxICON(mondrian));
 
     // create a menu bar

-//    wxMenu *menuFile = new wxMenu;
-    wxMenu *menuFile = new wxMenu(wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);

 
     menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->Append(Minimal_Test, "&Test...\tCtrl-T", "Test");
 
     menuFile->Append(Minimal_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->Append(Minimal_Test, "&Test...\tCtrl-T", "Test");

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 34d188bfb1bd57dbecbe59bb9b4b05dce1cd7aa2..10656f39f4c671699a439a46fbc168cc3cb0f90c 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -626,19 +626,9 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 

-wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
-{
-   Init(title, func, style);
-}
-
-wxMenu::wxMenu(long style)
-{
-   Init(wxEmptyString, (wxFunction) NULL, style);
-}
-

 void
 wxMenu::Init( const wxString& title,
 void
 wxMenu::Init( const wxString& title,

-              long style,
+              long style

 #ifdef WXWIN_COMPATIBILITY
               , const wxFunction func
 #endif
 #ifdef WXWIN_COMPATIBILITY
               , const wxFunction func
 #endif

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 34d188bfb1bd57dbecbe59bb9b4b05dce1cd7aa2..10656f39f4c671699a439a46fbc168cc3cb0f90c 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -626,19 +626,9 @@ bool wxMenuItem::IsChecked() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
 

-wxMenu::wxMenu( const wxString& title, const wxFunction func, long style )
-{
-   Init(title, func, style);
-}
-
-wxMenu::wxMenu(long style)
-{
-   Init(wxEmptyString, (wxFunction) NULL, style);
-}
-

 void
 wxMenu::Init( const wxString& title,
 void
 wxMenu::Init( const wxString& title,

-              long style,
+              long style

 #ifdef WXWIN_COMPATIBILITY
               , const wxFunction func
 #endif
 #ifdef WXWIN_COMPATIBILITY
               , const wxFunction func
 #endif