add wxUSE_IMAGE to setup.h and GetHFONT to wxFont.

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index fb131cd96ce6e89c9e41b70b98aa033c11c2b543..a693f638ae4631171ae0d2f77633a08e215b2ccb 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -22,12 +22,14 @@
 class WXDLLEXPORT wxDialogBase : public wxPanel
 {
 public:
+#ifdef __WXMAC_X__
+    ~wxDialogBase() {}  // Added min for Mac X
+#endif
     // the modal dialogs have a return code - usually the id of the last
     // pressed button
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
     int GetReturnCode() const { return m_returnCode; }
 
-protected:
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
@@ -35,6 +37,7 @@ protected:
     // places buttons into a horizontal wxBoxSizer
     wxSizer *CreateButtonSizer( long flags );
 
+protected:
     // the return code from modal dialog
     int m_returnCode;
 };