removed #ifdef wxTopLevelWindowNative -- it's now defined for all ports

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index c6c995cf30ddd728f07127a4d4e67e3834b931b3..b25ccf532cb77a8d40aea1c2d9be20d68600e8a9 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -98,14 +98,11 @@ private:
 // wxDialogBase
 // ----------------------------------------------------------------------------
 
 // wxDialogBase
 // ----------------------------------------------------------------------------
 

-// FIXME - temporary hack in absence of wxTopLevelWindow, should be always used
-#ifdef wxTopLevelWindowNative

 BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
 END_EVENT_TABLE()
 
 WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase, wxTopLevelWindow)
 BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
 END_EVENT_TABLE()
 
 WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase, wxTopLevelWindow)

-#endif

 
 void wxDialogBase::Init()
 {
 
 void wxDialogBase::Init()
 {


@@ -118,9 +115,7 @@ void wxDialogBase::Init()
     // undesirable and can lead to unexpected and hard to find bugs
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
 
     // undesirable and can lead to unexpected and hard to find bugs
     SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
 

-#ifdef wxTopLevelWindowNative // FIXME - temporary hack, should be always used!

     m_container.SetContainerWindow(this);
     m_container.SetContainerWindow(this);

-#endif

 }
 
 #if wxUSE_STATTEXT
 }
 
 #if wxUSE_STATTEXT