We surely don't need two debugging sections,

[wxWidgets.git] / include / wx / dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index cfab0663ad72c34446e5f527e8a005428cd51c9d..5324bc17bb1695f002cb6c760f04580f5a27920a 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dialogbase.h"
 #endif
 
@@ -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,15 +48,12 @@ 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
 };
 
 
-#if defined(__WXUNIVERSAL__)
+#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
     #include "wx/univ/dialog.h"
 #else
     #if defined(__WXMSW__)
@@ -75,8 +66,6 @@ protected:
         #include "wx/mac/dialog.h"
     #elif defined(__WXPM__)
         #include "wx/os2/dialog.h"
-    #elif defined(__WXSTUBS__)
-        #include "wx/stubs/dialog.h"
     #endif
 #endif