Fix up NSSlider code to not use class posing and instantiate the proper type (now...

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

diff --git a/include/wx/palmos/menu.h b/include/wx/palmos/menu.h
index 897dd7a88b614f6392b717b1383db5dd3a979a75..4980b4523cfe6bf7ad8897aba13df5d4fdc7072b 100644 (file)
--- a/include/wx/palmos/menu.h
+++ b/include/wx/palmos/menu.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 
 #ifndef _WX_MENU_H_
 #define _WX_MENU_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "menu.h"
-#endif
-

 #if wxUSE_ACCEL
     #include "wx/accel.h"
     #include "wx/dynarray.h"
 #if wxUSE_ACCEL
     #include "wx/accel.h"
     #include "wx/dynarray.h"


@@ -23,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
 
 #include "wx/arrstr.h"
 #endif
 
 #include "wx/arrstr.h"


@@ -55,17 +51,6 @@ 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
     // -------------------------------