Bo's patch adding Selection API and some more changes, doesn't compile yet

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 766771c42d538c2b5f5cf2b7dc07b89bb7a2f38d..fe52966b049a67d4fb2db5596875526fe10a80fb 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -13,11 +13,10 @@
 #define _WX_DIALOG_H_BASE_
 
 #include "wx/defs.h"
-#include "wx/containr.h"
 #include "wx/toplevel.h"
 
-class WXDLLEXPORT wxSizer;
-class WXDLLEXPORT wxStdDialogButtonSizer;
+class WXDLLIMPEXP_FWD_CORE wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
 
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
@@ -64,6 +63,10 @@ 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
+    wxWindow *GetParentForModalDialog(wxWindow *parent = NULL) const;
+
 #if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
@@ -137,7 +140,6 @@ private:
 
     DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()
-    WX_DECLARE_CONTROL_CONTAINER();
 };