X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..98c919483746ad0836f8f70a7d12f8e2d1e7d52b:/include/wx/dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 41f00bde3a..7146986a5e 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -30,10 +30,10 @@ class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:
     wxDialogBase() { Init(); }
-    ~wxDialogBase() {}
-    
+    virtual ~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; }
@@ -44,7 +44,7 @@ public:
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
 #endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
-    
+
 #if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );
@@ -55,26 +55,29 @@ protected:
     int m_returnCode;
 
     // FIXME - temporary hack in absence of wxTLW !!
-    #ifdef wxTopLevelWindowNative
+#ifdef wxTopLevelWindowNative
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();
-    #endif
+#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(__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__) && !defined(__WXMICROWIN__)
+    #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