Lots of updates for color dialog and sliders

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index b3d75ccfbb25dbd41a7dedd0e3931e16b6dd57b3..7146986a5e6c62b2f0cc6fd73f7501d905772e70 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -30,10 +30,10 @@ class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:
     wxDialogBase() { Init(); }
 {
 public:
     wxDialogBase() { Init(); }

-    ~wxDialogBase() {}
-    
+    virtual ~wxDialogBase() { }
+

     void Init();
     void Init();

-    
+

     // the modal dialogs have a return code - usually the id of the last
     // pressed button
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
     // 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
     // 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 );
 #if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );


@@ -55,14 +55,14 @@ protected:
     int m_returnCode;
 
     // FIXME - temporary hack in absence of wxTLW !!
     int m_returnCode;
 
     // FIXME - temporary hack in absence of wxTLW !!

-    #ifdef wxTopLevelWindowNative
+#ifdef wxTopLevelWindowNative

     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();
     DECLARE_EVENT_TABLE()
     WX_DECLARE_CONTROL_CONTAINER();

-    #endif
+#endif

 };
 
 
 };
 
 

-#if defined(__WXUNIVERSAL__)
+#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)

     #include "wx/univ/dialog.h"
 #else
     #if defined(__WXMSW__)
     #include "wx/univ/dialog.h"
 #else
     #if defined(__WXMSW__)