add new predefined colour (and relative brush/pen): wxYELLOW (closes #10669)

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 9eee12da29ea6843403c2b8e230a3b008e6e49a5..4951bc72b26644d15cd9b1fa811895c0792533ce 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -91,7 +91,7 @@ public:
     int GetEscapeId() const { return m_escapeId; }
 
     // Returns the parent to use for modal dialogs if the user did not specify it
-    // explicitly
+    // explicitly. If parent argument is NULL, use GetParent() by default.
     wxWindow *GetParentForModalDialog(wxWindow *parent = NULL) const;
 
 #if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
@@ -211,6 +211,10 @@ private:
     // common part of all ctors
     void Init();
 
+    // helper of GetParentForModalDialog(): returns the passed in window if it
+    // can be used as our parent or NULL if it can't
+    wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;
+
     // handle Esc key presses
     void OnCharHook(wxKeyEvent& event);
 
@@ -224,7 +228,7 @@ private:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 
-    DECLARE_NO_COPY_CLASS(wxDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxDialogBase);
     DECLARE_EVENT_TABLE()
 };
 
@@ -314,7 +318,7 @@ public:
     #elif defined(__WXGTK__)
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/dialog.h"
+        #include "wx/osx/dialog.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)