fixed wxRadioBox positioning to take the client area origin into account; also simpli...

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 62bfb792650b52d46cba89bdd21c101d181d47fd..a791d83c55e17835d56debd278a0501caf477fe8 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -53,9 +53,9 @@ enum wxDialogLayoutAdaptationMode
     wxDIALOG_ADAPTATION_MODE_DISABLED = 2   // disable this dialog overriding global status
 };
 
-extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 
-class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
 {
 public:
     enum
@@ -90,8 +90,11 @@ public:
     void SetEscapeId(int escapeId);
     int GetEscapeId() const { return m_escapeId; }
 
-    // Returns the parent to use for modal dialogs if the user did not specify it
-    // explicitly
+    // Find the parent to use for modal dialog: try to use the specified parent
+    // but fall back to the current active window or main application window as
+    // last resort if it is unsuitable.
+    //
+    // This function always returns a valid top level window or NULL.
     wxWindow *GetParentForModalDialog(wxWindow *parent = NULL) const;
 
 #if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
@@ -211,6 +214,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 +231,7 @@ private:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 
-    DECLARE_NO_COPY_CLASS(wxDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxDialogBase);
     DECLARE_EVENT_TABLE()
 };
 
@@ -235,7 +242,7 @@ private:
  * a help mechanism.
  */
 
-class WXDLLEXPORT wxDialogLayoutAdapter: public wxObject
+class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject
 {
     DECLARE_CLASS(wxDialogLayoutAdapter)
 public:
@@ -253,7 +260,7 @@ public:
  *
  */
 
-class WXDLLEXPORT wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
+class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
 {
     DECLARE_CLASS(wxStandardDialogLayoutAdapter)
 public:
@@ -314,7 +321,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__)