Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

[wxWidgets.git] / include / wx / msw / menu.h

diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h
index d12c25c59c2acdf5e121d05a3769f2f39d085912..fde736405352f96b9bb30886639bffbfad1b6cff 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -19,10 +19,10 @@
     WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 
     WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
 #endif // wxUSE_ACCEL
 

-class WXDLLEXPORT wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxFrame;

 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR

-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;

 #endif
 
 
 #endif
 
 


@@ -56,11 +56,6 @@ public:
 
     virtual ~wxMenu();
 
 
     virtual ~wxMenu();
 

-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
-

     virtual void Break();
 
     virtual void SetTitle(const wxString& title);
     virtual void Break();
 
     virtual void SetTitle(const wxString& title);


@@ -91,6 +86,11 @@ public:
     int FindAccel(int id) const;
 #endif // wxUSE_ACCEL
 
     int FindAccel(int id) const;
 #endif // wxUSE_ACCEL
 

+protected:
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);
+

 private:
     // common part of all ctors
     void Init();
 private:
     // common part of all ctors
     void Init();