Fixed ambiguity

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

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index 30d31527f3642afba6705f27d67402c4b28a2de1..e3060763487b0229b4bcf7ccb97d4bfb1cefbb57 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -49,6 +49,17 @@ public:
 
     virtual void SetTitle(const wxString& title);
 
 
     virtual void SetTitle(const wxString& title);
 

+    // deprecated functions
+#if wxUSE_MENU_CALLBACK
+    wxMenu(const wxString& title, const wxFunction func)
+        : wxMenuBase(title)
+    {
+        Init();
+
+        Callback(func);
+    }
+#endif // wxUSE_MENU_CALLBACK
+

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 


@@ -158,7 +169,7 @@ public:
     void Refresh();
 
     // To avoid compile warning
     void Refresh();
 
     // To avoid compile warning

-    void Refresh( bool eraseBackground = TRUE,
+    void Refresh( bool eraseBackground,

                           const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); }
 
 protected:
                           const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); }
 
 protected: