X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfe1eee3bb9ecde8c4490ea69c07b5030d69530c..80b2db4ee671f62a1de0f9f91e007c83449df107:/include/wx/dialog.h?ds=sidebyside

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 709d6f5f0b..f9cfb80b71 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -12,71 +12,66 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "dialogbase.h"
+#endif
+
 #include "wx/defs.h"
-#include "wx/panel.h"
+#include "wx/containr.h"
+#include "wx/toplevel.h"
 
-class WXDLLEXPORT wxDialogBase : public wxPanel
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+
+class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:
+    wxDialogBase() { Init(); }
+    virtual ~wxDialogBase() { }
+
+    void Init();
+
     // 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:
-    // functions to help with dialog layout
-    // ------------------------------------
-
-    // constants used in dialog layout
-    static const long LAYOUT_X_MARGIN;
-    static const long LAYOUT_Y_MARGIN;
-    static const long MARGIN_BETWEEN_BUTTONS;
+#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
 
-    // Split the message in lines putting them into the array and calculating
-    // the maximum line width/height which is returned as wxSize.
-    wxSize SplitTextMessage(const wxString& message, wxArrayString *lines);
-
-    // Creates the (possibly multiline) message, assuming each line has the
-    // size sizeText (which can be retrieved from SplitTextMessage). Returns
-    // the bottom border of the multiline text zone.
-    long CreateTextMessage(const wxArrayString& lines,
-                           const wxPoint& posText,
-                           const wxSize& sizeText);
-
-    // Returns the preferred size for the buttons in the dialog
-    wxSize GetStandardButtonSize(bool hasCancel = TRUE);
-
-    // Create the standard [Ok] and [Cancel] (if hasCancel) buttons centering
-    // them with respect to the dialog width wDialog at vertical position y.
-    // wButton and hButton is the size of the button (which can be retrieved
-    // from GetStandardButtonSize)
-    void CreateStandardButtons(long wDialog,
-                               long y,
-                               long wButton,
-                               long hButton,
-                               bool hasCancel = TRUE);
-
-    // Returns the standard height of single line text ctrl (it's not the same
-    // as the height of just text which may be retrieved from
-    // wxGetCharHeight())
-    long GetStandardTextHeight();
+#if wxUSE_BUTTON
+    // places buttons into a horizontal wxBoxSizer
+    wxSizer *CreateButtonSizer( long flags );
+#endif // wxUSE_BUTTON
 
+protected:
     // the return code from modal dialog
     int m_returnCode;
+
+    DECLARE_NO_COPY_CLASS(wxDialogBase)
+    DECLARE_EVENT_TABLE()
+    WX_DECLARE_CONTROL_CONTAINER();
 };
 
-#if defined(__WXMSW__)
-    #include "wx/msw/dialog.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/dialog.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/dialog.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/dialog.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/dialog.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/dialog.h"
+
+#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
+    #include "wx/univ/dialog.h"
+#else
+    #if defined(__WXMSW__)
+        #include "wx/msw/dialog.h"
+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/dialog.h"
+    #elif defined(__WXGTK__)
+        #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
 #endif
 
 #endif