X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0a6bb75bcd4b5a4873d766a9208ac6376fe8625..8704b36653dc76ed7b6743642fb2925ffc5789d7:/include/wx/msw/dialog.h?ds=sidebyside diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index f97ed29db0..319cd2bcc4 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -1,24 +1,30 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/msw/dialog.h // Purpose: wxDialog class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dialog.h" #endif #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; + +class WXDLLEXPORT wxDialogModalData; + +#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) +class WXDLLEXPORT wxToolBar; +#endif // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase @@ -26,19 +32,7 @@ class WXDLLEXPORT wxDialog : public wxDialogBase public: wxDialog() { Init(); } - // Constructor with a modal flag, but no window id - the old convention - wxDialog(wxWindow *parent, - const wxString& title, bool modal, - int x = -1, int y= -1, int width = 500, int height = 500, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; - Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), - style | modalStyle, name); - } - - // Constructor with no modal flag - the new convention. + // full ctor wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -46,7 +40,9 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr) { - Create(parent, id, title, pos, size, style, name); + Init(); + + (void)Create(parent, id, title, pos, size, style, name); } bool Create(wxWindow *parent, wxWindowID id, @@ -56,37 +52,40 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); + virtual ~wxDialog(); - // override some base class virtuals - virtual bool Destroy(); - virtual bool Show(bool show); - virtual void Iconize(bool iconize); - virtual bool IsIconized() const; + // return true if we're showing the dialog modally + virtual bool IsModal() const { return m_modalData != NULL; } - virtual bool IsTopLevel() const { return TRUE; } - - void SetModal(bool flag); - virtual bool IsModal() const; - - // For now, same as Show(TRUE) but returns return code + // show the dialog modally and return the value passed to EndModal() virtual int ShowModal(); // may be called to terminate the dialog with the given return code virtual void EndModal(int retCode); - // returns TRUE if we're in a modal loop - bool IsModalShowing() const; - -#if WXWIN_COMPATIBILITY - bool Iconized() const { return IsIconized(); }; +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + // create main toolbar by calling OnCreateToolBar() + virtual wxToolBar* CreateToolBar(long style = -1, + wxWindowID winid = wxID_ANY, + const wxString& name = wxToolBarNameStr); + // return a new toolbar + virtual wxToolBar *OnCreateToolBar(long style, + wxWindowID winid, + const wxString& name ); + + // get the main toolbar + wxToolBar *GetToolBar() const { return m_dialogToolBar; } #endif // implementation only from now on // ------------------------------- + // override some base class virtuals + virtual bool Show(bool show = true); + + virtual void Raise(); + // event handlers - bool OnClose(); void OnCharHook(wxKeyEvent& event); void OnCloseWindow(wxCloseEvent& event); @@ -98,34 +97,60 @@ public: // Responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); +#ifdef __POCKETPC__ + // Responds to the OK button in a PocketPC titlebar. This + // can be overridden, or you can change the id used for + // sending the event with SetAffirmativeId. Returns false + // if the event was not processed. + virtual bool DoOK(); +#endif + // Windows callbacks - long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -#if wxUSE_CTL3D - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -#endif // wxUSE_CTL3D + // obsolete methods + // ---------------- -protected: - // override more base class virtuals - virtual void DoSetClientSize(int width, int height); - virtual void DoGetPosition(int *x, int *y) const; + // use the other ctor + wxDEPRECATED( wxDialog(wxWindow *parent, + const wxString& title, bool modal, + int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500, + long style = wxDEFAULT_DIALOG_STYLE, + const wxString& name = wxDialogNameStr) ); + + // just call Show() or ShowModal() + wxDEPRECATED( void SetModal(bool flag) ); - // show modal dialog and enter modal loop - void DoShowModal(); + // use IsModal() + wxDEPRECATED( bool IsModalShowing() const ); + +protected: + // find the window to use as parent for this dialog if none has been + // specified explicitly by the user + // + // may return NULL + wxWindow *FindSuitableParent() const; // common part of all ctors void Init(); + // end either modal or modeless dialog + void EndDialog(int rc); + private: - wxWindow *m_oldFocus; + wxWindow* m_oldFocus; + bool m_endModalCalled; // allow for closing within InitDialog + +#if wxUSE_TOOLBAR && defined(__POCKETPC__) + wxToolBar* m_dialogToolBar; +#endif - // while we are showing a modal dialog we disable the other windows using - // this object - class wxWindowDisabler *m_windowDisabler; + // this pointer is non-NULL only while the modal event loop is running + wxDialogModalData *m_modalData; DECLARE_DYNAMIC_CLASS(wxDialog) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxDialog) }; #endif