X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1777b9bbf4573dabecf4a3256d0d3c2c0c2a3fdf..abb69c6c82d61cf18f14270650a68896a3d8ed47:/include/wx/dialog.h diff --git a/include/wx/dialog.h b/include/wx/dialog.h index 8a4737c2f4..c96c015e73 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -12,55 +12,36 @@ #ifndef _WX_DIALOG_H_BASE_ #define _WX_DIALOG_H_BASE_ +#ifdef __GNUG__ + #pragma interface "dialogbase.h" +#endif + #include "wx/defs.h" #include "wx/panel.h" class WXDLLEXPORT wxDialogBase : public wxPanel { public: +#ifdef __DARWIN__ + ~wxDialogBase() { } +#endif // 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; - - // 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_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 + +#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; }; @@ -71,6 +52,9 @@ protected: #include "wx/motif/dialog.h" #elif defined(__WXGTK__) #include "wx/gtk/dialog.h" +#elif defined(__WXMGL__) + #include "wx/mgl/dialog.h" +// FIXME_MGL -- belongs to wxUniv #elif defined(__WXQT__) #include "wx/qt/dialog.h" #elif defined(__WXMAC__)