X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b07664068bc48173d08e3146ca05dceac275aa6a..a200c35efa060107d8243458fca160eb237b9c23:/src/common/dlgcmn.cpp?ds=sidebyside

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 235f5416da..8895538665 100644
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -37,12 +37,33 @@
     #include "wx/stattext.h"
     #include "wx/sizer.h"
     #include "wx/button.h"
+    #include "wx/containr.h"
 #endif
 
+
 //--------------------------------------------------------------------------
 // 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)
+#endif
+
+void wxDialogBase::Init()
+{
+    m_returnCode = 0;
+#ifdef wxTopLevelWindowNative // FIXME - temporary hack, should be always used!
+    m_container.SetContainerWindow(this);
+#endif
+}
+
+#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+
 wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
 {
     wxBoxSizer *box = new wxBoxSizer( wxVERTICAL );
@@ -86,6 +107,10 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString &message )
     return box;
 }
 
+#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+
+#if wxUSE_BUTTON
+
 wxSizer *wxDialogBase::CreateButtonSizer( long flags )
 {
     wxBoxSizer *box = new wxBoxSizer( wxHORIZONTAL );
@@ -174,3 +199,4 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
     return box;
 }
 
+#endif // wxUSE_BUTTON