X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..d3fa4bc22e84e3ca4d88cc1772f2d414140a1017:/interface/wx/dialog.h diff --git a/interface/wx/dialog.h b/interface/wx/dialog.h index 1afacb2d05..3407302fcd 100644 --- a/interface/wx/dialog.h +++ b/interface/wx/dialog.h @@ -16,6 +16,16 @@ enum wxDialogLayoutAdaptationMode wxDIALOG_ADAPTATION_MODE_DISABLED = 2 ///< Disable this dialog overriding global status. }; +#define wxDIALOG_NO_PARENT 0x00000020 ///< Don't make owned by apps top window + +#define wxDEFAULT_DIALOG_STYLE (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX) + + +#define wxDIALOG_ADAPTATION_NONE 0 ///< Don't do any layout adaptation +#define wxDIALOG_ADAPTATION_STANDARD_SIZER 1 ///< Only look for wxStdDialogButtonSizer for non-scrolling part +#define wxDIALOG_ADAPTATION_ANY_SIZER 2 ///< Also look for any suitable sizer for non-scrolling part +#define wxDIALOG_ADAPTATION_LOOSE_BUTTONS 3 ///< Also look for 'loose' standard buttons for non-scrolling part + /** @class wxDialog @@ -88,7 +98,7 @@ enum wxDialogLayoutAdaptationMode Equivalent to a combination of wxCAPTION, wxCLOSE_BOX and wxSYSTEM_MENU (the last one is not used under Unix). @style{wxRESIZE_BORDER} - Display a resizeable frame around the window. + Display a resizable frame around the window. @style{wxSYSTEM_MENU} Display a system menu. @style{wxCLOSE_BOX} @@ -102,8 +112,8 @@ enum wxDialogLayoutAdaptationMode @style{wxSTAY_ON_TOP} The dialog stays on top of all other windows. @style{wxNO_3D} - Under Windows, specifies that the child controls should not have 3D - borders unless specified in the control. + This style is obsolete and doesn't do anything any more, don't use + it in any new code. @style{wxDIALOG_NO_PARENT} By default, a dialog created with a @NULL parent window will be given the @ref wxApp::GetTopWindow() "application's top level window" @@ -112,7 +122,7 @@ enum wxDialogLayoutAdaptationMode @style{wxDIALOG_EX_CONTEXTHELP} Under Windows, puts a query button on the caption. When pressed, Windows will go into a context-sensitive help mode and wxWidgets - will send a wxEVT_HELP event if the user clicked on an application + will send a @c wxEVT_HELP event if the user clicked on an application window. Note that this is an extended style and must be set by calling SetExtraStyle() before Create is called (two-step construction). @@ -248,9 +258,30 @@ public: @note Just like CreateButtonSizer(), this function may return @NULL if no buttons were created. + + This is a combination of CreateButtonSizer() and + CreateSeparatedSizer(). */ wxSizer* CreateSeparatedButtonSizer(long flags); + /** + Returns the sizer containing the given one with a separating + wxStaticLine if necessarily. + + This function is useful for creating the sizer containing footer-like + contents in dialog boxes. It will add a separating static line only if + it conforms to the current platform convention (currently it is not + added under Mac where the use of static lines for grouping is + discouraged and is added elsewhere). + + @since 2.9.2 + + @param sizer The sizer to wrap, must be non-@NULL. + @return The sizer wrapping the input one or possibly the input sizer + itself if no wrapping is necessary. + */ + wxSizer *CreateSeparatedSizer(wxSizer *sizer); + /** Creates a wxStdDialogButtonSizer with standard buttons. @a flags is a bit list of the following flags: wxOK, wxCANCEL, wxYES, wxNO, wxAPPLY, @@ -260,6 +291,12 @@ public: */ wxStdDialogButtonSizer* CreateStdDialogButtonSizer(long flags); + /** + Splits text up at newlines and places the lines into wxStaticText + objects in a vertical wxBoxSizer. + */ + wxSizer *CreateTextSizer( const wxString& message ); + /** Performs layout adaptation, usually if the dialog is too large to fit on the display. @@ -430,28 +467,11 @@ public: */ virtual bool IsModal() const; - /** - The default handler for wxEVT_SYS_COLOUR_CHANGED. - - @param event - The colour change event. - - @remarks Changes the dialog's colour to conform to the current settings - (Windows only). Add an event table entry for your dialog class - if you wish the behaviour to be different (such as keeping a - user-defined background colour). If you do override this - function, call wxEvent::Skip() to propagate the notification - to child windows and controls. - - @see wxSysColourChangedEvent - */ - void OnSysColourChanged(wxSysColourChangedEvent& event); - /** Sets the identifier to be used as OK button. When the button with this identifier is pressed, the dialog calls wxWindow::Validate() and wxWindow::TransferDataFromWindow() and, if they both return @true, - closes the dialog with wxID_OK return code. + closes the dialog with the affirmative id return code. Also, when the user presses a hardware OK button on the devices having one or the special OK button in the PocketPC title bar, an event with @@ -534,19 +554,6 @@ public: */ static wxDialogLayoutAdapter* SetLayoutAdapter(wxDialogLayoutAdapter* adapter); - /** - @deprecated This function doesn't work for all ports, just use - ShowModal() to show a modal dialog instead. - - Allows the programmer to specify whether the dialog box is modal - (Show() blocks control until the dialog is hidden) or modeless (control - returns immediately). - - @param flag - If @true, the dialog will be modal, otherwise it will be modeless. - */ - void SetModal(bool flag); - /** Sets the return code for this window. @@ -573,7 +580,7 @@ public: virtual bool Show(bool show = 1); /** - Shows a modal dialog. + Shows an application-modal dialog. Program flow does not return until the dialog has been dismissed with EndModal(). @@ -590,9 +597,26 @@ public: @return The value set with SetReturnCode(). - @see EndModal(), GetReturnCode(), SetReturnCode() + @see ShowWindowModal(), EndModal(), GetReturnCode(), SetReturnCode() */ virtual int ShowModal(); + + /** + Shows a dialog modal to the parent top level window only. + + Unlike ShowModal(), dialogs shown with this function only prevent the + user from interacting with their parent frame only but not with the + rest of the application. They also don't block the program execution + but instead return immediately, as Show(), and generate a + wxEVT_WINDOW_MODAL_DIALOG_CLOSED event later when the dialog is closed. + + Currently this function is only fully implemented in wxOSX ports, under + the other platforms it behaves like ShowModal() (but also sends the + above mentioned event). + + @since 2.9.0 + */ + void ShowWindowModal(); }; @@ -600,7 +624,7 @@ public: /** @class wxDialogLayoutAdapter - This abstract class is the base for classes that help wxWidgets peform + This abstract class is the base for classes that help wxWidgets perform run-time layout adaptation of dialogs. Principally, this is to cater for small displays by making part of the dialog scroll, but the application developer may find other uses for layout adaption. @@ -635,3 +659,13 @@ public: virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0; }; + +class wxWindowModalDialogEvent : public wxCommandEvent +{ +public: + wxWindowModalDialogEvent (wxEventType commandType = wxEVT_NULL, int id = 0); + + wxDialog *GetDialog() const; + int GetReturnCode() const; + virtual wxEvent *Clone() const; +};