removed wxTLW cruft now that all ports have it

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index e20dc2432296014cd09ef9a20a9fe7626cd53b0e..5324bc17bb1695f002cb6c760f04580f5a27920a 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -20,13 +20,7 @@
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 

-// FIXME - temporary hack in absence of wxTLW !!
-#ifndef wxTopLevelWindowNative
-#include "wx/panel.h"
-class WXDLLEXPORT wxDialogBase : public wxPanel
-#else

 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow

-#endif

 {
 public:
     wxDialogBase() { Init(); }
 {
 public:
     wxDialogBase() { Init(); }


@@ -54,11 +48,8 @@ protected:
     // the return code from modal dialog
     int m_returnCode;
 
     // the return code from modal dialog
     int m_returnCode;
 

-    // FIXME - temporary hack in absence of wxTLW !!
-#ifdef wxTopLevelWindowNative

     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();

-#endif

 };
 
 
 };
 
 

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 0fbb3f4e0689d612371e8c85e9246e437a0060d2..024c6f9bd235093743fe98ac752107a5447c9d71 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -44,12 +44,7 @@ class WXDLLEXPORT wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 

-// FIXME - temporary hack in absence of wxTLW !!
-#ifndef wxTopLevelWindowNative
-class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase
-#else

 class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
 class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow

-#endif

 {
 public:
     // construction
 {
 public:
     // construction

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 8ab73139d86d4f4a59444f19f49378c18d18cfa2..f36f762caecea3ee97242d62bee8caed437b567e 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -41,11 +41,6 @@
     #include "wx/statusbr.h"
 #endif
 
     #include "wx/statusbr.h"
 #endif
 

-// FIXME - temporary hack in absence of wxTLW in all ports!
-#ifndef wxTopLevelWindowNative
-    #define wxTopLevelWindow wxTopLevelWindowBase
-#endif
-

 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index b1af3fdd14ece11311c8a76ec6b20c08d2bf198e..23eaa3295b15a5af96762eed229c705e801c1bdb 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -46,10 +46,7 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-// FIXME: some platforms don't have wxTopLevelWindow yet
-#ifdef wxTopLevelWindowNative
-    IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow)

 
 // ----------------------------------------------------------------------------
 // construction/destruction
 
 // ----------------------------------------------------------------------------
 // construction/destruction