X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50f1fb9226d9260454ccb9c8a67d0be23c2827f..74c481d11721fb42343c6b79996478a2ebacde3a:/include/wx/msw/dialog.h?ds=sidebyside diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index ccc130f2ac..879ae3a79d 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 @@ -20,27 +20,15 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +class WXDLLEXPORT wxDialogModalData; + // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase { - DECLARE_DYNAMIC_CLASS(wxDialog) - public: - wxDialog(); - - // 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); - } + wxDialog() { Init(); } - // Constructor with no modal flag - the new convention. + // full ctor wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -48,7 +36,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, @@ -58,47 +48,29 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); - - void SetReturnCode(int returnCode) { m_returnCode = returnCode; } - int GetReturnCode() const { return m_returnCode; } + virtual ~wxDialog(); - virtual bool Destroy(); + // return true if we're showing the dialog modally + virtual bool IsModal() const { return m_modalData != NULL; } - virtual void DoSetClientSize(int width, int height); - - virtual void GetPosition(int *x, int *y) const; + // show the dialog modally and return the value passed to EndModal() + virtual int ShowModal(); - bool Show(bool show); - bool IsShown() const; - void Iconize(bool iconize); + // may be called to terminate the dialog with the given return code + virtual void EndModal(int retCode); -#if WXWIN_COMPATIBILITY - bool Iconized() const { return IsIconized(); }; -#endif + // implementation only from now on + // ------------------------------- - virtual bool IsIconized() const; - void Fit(); + // override some base class virtuals + virtual bool Show(bool show = TRUE); - void SetTitle(const wxString& title); - wxString GetTitle() const ; + virtual void Raise(); - void OnSize(wxSizeEvent& event); - bool OnClose(); + // event handlers void OnCharHook(wxKeyEvent& event); - void OnPaint(wxPaintEvent& event); void OnCloseWindow(wxCloseEvent& event); - void SetModal(bool flag); - - virtual void Centre(int direction = wxBOTH); - virtual bool IsModal() const - { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } - - // For now, same as Show(TRUE) but returns return code - virtual int ShowModal(); - virtual void EndModal(int retCode); - // Standard buttons void OnOK(wxCommandEvent& event); void OnApply(wxCommandEvent& event); @@ -107,34 +79,54 @@ public: // Responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); - // implementation - // -------------- - - long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + // Windows callbacks + 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 - bool IsModalShowing() const { return m_modalShowing; } + // obsolete methods + // ---------------- - // tooltip management -#if wxUSE_TOOLTIPS - WXHWND GetToolTipCtrl() const { return m_hwndToolTip; } - void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; } -#endif // tooltips + // use the other ctor + wxDEPRECATED( 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) ); + + // just call Show() or ShowModal() + wxDEPRECATED( void SetModal(bool flag) ); + + // use IsModal() + wxDEPRECATED( bool IsModalShowing() const ); protected: - bool m_modalShowing; - WXHWND m_hwndOldFocus; // the window which had focus before we were shown + // 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: -#if wxUSE_TOOLTIPS - WXHWND m_hwndToolTip; -#endif // tooltips + wxWindow* m_oldFocus; + bool m_endModalCalled; // allow for closing within InitDialog + + // this pointer is non-NULL only while the modal event loop is running + wxDialogModalData *m_modalData; - int m_returnCode; + DECLARE_DYNAMIC_CLASS(wxDialog) DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxDialog) }; #endif