From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 9 Jul 2001 21:41:19 +0000 (+0000)
Subject: simplified RTTI chain: wxFrame base class is now directly wxWindow, not wxFrameMSW
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/af8964c4c3770b2d54ee54a9f8275113e944a3d9

simplified RTTI chain: wxFrame base class is now directly wxWindow, not wxFrameMSW


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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 4d68e89032..0667019482 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -240,113 +240,48 @@ protected:
 // include the real class declaration
 #if defined(__WXMSW__)
     #include "wx/msw/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    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
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/frame.h"
+    #define wxFrameNative wxFrameMSW
 #elif defined(__WXGTK__)
     #include "wx/gtk/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    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
-#elif defined(__WXMGL__)
-    #include "wx/mgl/frame.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/frame.h"
+    #define wxFrameNative wxFrameGTK
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/frame.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameMac
-    {
-    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
+    #define wxFrameNative wxFrameMac
+#elif defined(__WXMGL__)
+    #include "wx/mgl/frame.h"
+    #define wxFrameNative wxFrameMGL
 #elif defined(__WXPM__)
     #include "wx/os2/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameOS2
-    {
-    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
-
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/frame.h"
+    #define wxFrameNative wxFrameOS2
 #endif
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/frame.h"
-#endif
+#else // !__WXUNIVERSAL__
+    #ifdef wxFrameNative
+        class WXDLLEXPORT wxFrame : public wxFrameNative
+        {
+        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 // wxFrameNative
+#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
 #endif
     // _WX_FRAME_H_BASE_
diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 23dde5eab4..fd7e72f4d3 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -136,9 +136,6 @@ protected:
 
     // is the frame currently iconized?
     bool          m_isIconized;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFrameGTK)
 };
 
 #endif // __GTKFRAMEH__
diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 23dde5eab4..fd7e72f4d3 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -136,9 +136,6 @@ protected:
 
     // is the frame currently iconized?
     bool          m_isIconized;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFrameGTK)
 };
 
 #endif // __GTKFRAMEH__
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index e8a0981bae..9b76f8b8c0 100644
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -186,7 +186,6 @@ private:
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
-    DECLARE_DYNAMIC_CLASS(wxFrameMSW)
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 63af2106f8..9bd428174f 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -65,11 +65,8 @@ extern int g_openDialogs;
 // event tables
 // ----------------------------------------------------------------------------
 
-#ifdef __WXUNIVERSAL__
-    IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
-    IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
+#ifndef __WXUNIVERSAL__
+    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 63af2106f8..9bd428174f 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -65,11 +65,8 @@ extern int g_openDialogs;
 // event tables
 // ----------------------------------------------------------------------------
 
-#ifdef __WXUNIVERSAL__
-    IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
-#else
-    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
-    IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
+#ifndef __WXUNIVERSAL__
+    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index a7f299a05d..e99831a461 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -80,10 +80,8 @@ BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrameMSW, wxWindow)
-
 #ifndef __WXUNIVERSAL__
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
+    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 #endif
 
 // ============================================================================