Some wxUniv compile fixes

[wxWidgets.git] / include / wx / frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 039d1f258e435771e054c24fdb3696bd0f70d144..7277261c8361803ae819dc49ba7456aa70c761df 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -239,19 +239,55 @@ protected:
 
 // include the real class declaration
 #if defined(__WXMSW__)
+    #include "wx/msw/frame.h"
     #ifndef __WXUNIVERSAL__
-        #define wxFrameMSW wxFrame
-        #define sm_classwxFrameMSW sm_classwxFrame
+
+    class WXDLLEXPORT wxFrame : public wxFrameMSW
+    {
+    public:
+        // construction
+        wxFrame() { Init(); }
+        wxFrame(wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& title,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxDEFAULT_FRAME_STYLE,
+                   const wxString& name = wxFrameNameStr)
+        {
+            Init();
+            Create(parent, id, title, pos, size, style, name);
+        }
+        DECLARE_DYNAMIC_CLASS(wxFrame)
+    };
+
     #endif
-    #include "wx/msw/frame.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/frame.h"
 #elif defined(__WXGTK__)
+    #include "wx/gtk/frame.h"
     #ifndef __WXUNIVERSAL__
-        #define wxFrameGTK wxFrame
-        #define sm_classwxFrameGTK sm_classwxFrame
+
+    class WXDLLEXPORT wxFrame : public wxFrameGTK
+    {
+    public:
+        // construction
+        wxFrame() { Init(); }
+        wxFrame(wxWindow *parent,
+                   wxWindowID id,
+                   const wxString& title,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = wxDEFAULT_FRAME_STYLE,
+                   const wxString& name = wxFrameNameStr)
+        {
+            Init();
+            Create(parent, id, title, pos, size, style, name);
+        }
+        DECLARE_DYNAMIC_CLASS(wxFrame)
+    };
+
     #endif
-    #include "wx/gtk/frame.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/frame.h"
 #elif defined(__WXQT__)