From ddbfcced85b54ed15ff40605d29e55d73d0e6d03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 7 Jan 2003 15:03:56 +0000 Subject: [PATCH] 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 --- include/wx/dialog.h | 9 --------- include/wx/frame.h | 5 ----- src/common/framecmn.cpp | 5 ----- src/common/toplvcmn.cpp | 5 +---- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/include/wx/dialog.h b/include/wx/dialog.h index e20dc24322..5324bc17bb 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -20,13 +20,7 @@ #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 -#endif { public: wxDialogBase() { Init(); } @@ -54,11 +48,8 @@ protected: // 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(); -#endif }; diff --git a/include/wx/frame.h b/include/wx/frame.h index 0fbb3f4e06..024c6f9bd2 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -44,12 +44,7 @@ class WXDLLEXPORT wxToolBar; // CreateXXXBar() is called. // ---------------------------------------------------------------------------- -// FIXME - temporary hack in absence of wxTLW !! -#ifndef wxTopLevelWindowNative -class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase -#else class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow -#endif { public: // construction diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 8ab73139d8..f36f762cae 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -41,11 +41,6 @@ #include "wx/statusbr.h" #endif -// FIXME - temporary hack in absence of wxTLW in all ports! -#ifndef wxTopLevelWindowNative - #define wxTopLevelWindow wxTopLevelWindowBase -#endif - // ---------------------------------------------------------------------------- // event table // ---------------------------------------------------------------------------- diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index b1af3fdd14..23eaa3295b 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -46,10 +46,7 @@ END_EVENT_TABLE() // implementation // ============================================================================ -// FIXME: some platforms don't have wxTopLevelWindow yet -#ifdef wxTopLevelWindowNative - IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) // ---------------------------------------------------------------------------- // construction/destruction -- 2.47.2