#endif
#include "wx/defs.h"
-#include "wx/panel.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
+#endif
{
public:
-#ifdef __WXMAC_X__
- ~wxDialogBase() {} // Added min for Mac X
-#endif
+ wxDialogBase() { Init(); }
+ ~wxDialogBase() {}
+
+ void Init();
+
// the modal dialogs have a return code - usually the id of the last
// pressed button
void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
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(__WXMSW__)
- #include "wx/msw/dialog.h"
-#elif defined(__WXMOTIF__)
- #include "wx/motif/dialog.h"
-#elif defined(__WXGTK__)
- #include "wx/gtk/dialog.h"
-#elif defined(__WXMGL__)
- #include "wx/mgl/dialog.h"
-// FIXME_MGL -- belongs to wxUniv
-#elif defined(__WXQT__)
- #include "wx/qt/dialog.h"
-#elif defined(__WXMAC__)
- #include "wx/mac/dialog.h"
-#elif defined(__WXPM__)
- #include "wx/os2/dialog.h"
-#elif defined(__WXSTUBS__)
- #include "wx/stubs/dialog.h"
+
+#if defined(__WXUNIVERSAL__)
+ #include "wx/univ/dialog.h"
+#else
+ #if defined(__WXMSW__)
+ #include "wx/msw/dialog.h"
+ #elif defined(__WXMOTIF__)
+ #include "wx/motif/dialog.h"
+ #elif defined(__WXGTK__)
+ #include "wx/gtk/dialog.h"
+ #elif defined(__WXMAC__)
+ #include "wx/mac/dialog.h"
+ #elif defined(__WXPM__)
+ #include "wx/os2/dialog.h"
+ #elif defined(__WXSTUBS__)
+ #include "wx/stubs/dialog.h"
+ #endif
#endif
#endif