Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 5324bc17bb1695f002cb6c760f04580f5a27920a..f13cc11a5fd6a5f30b1748147b5b6a2949273c58 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -20,6 +20,8 @@
 #include "wx/containr.h"
 #include "wx/toplevel.h"
 
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:
@@ -33,11 +35,11 @@ public:
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
     int GetReturnCode() const { return m_returnCode; }
 
-#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
-#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
 
 #if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer
@@ -64,6 +66,8 @@ protected:
         #include "wx/gtk/dialog.h"
     #elif defined(__WXMAC__)
         #include "wx/mac/dialog.h"
+    #elif defined(__WXCOCOA__)
+        #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)
         #include "wx/os2/dialog.h"
     #endif