/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/os2/dialog.h
// Purpose: wxDialog class
// Author: David Webster
// Modified by:
#include "wx/panel.h"
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
+
+//
// Dialog boxes
-class WXDLLEXPORT wxDialog: public wxDialogBase
+//
+class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase
{
- DECLARE_DYNAMIC_CLASS(wxDialog)
public:
- wxDialog();
-
- // Constructor with a modal flag, but no window id - the old convention
- inline 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);
- }
+ inline wxDialog() { Init(); }
- // Constructor with no modal flag - the new convention.
- inline wxDialog( wxWindow* parent
- ,wxWindowID id
- ,const wxString& title
- ,const wxPoint& pos = wxDefaultPosition
- ,const wxSize& size = wxDefaultSize
- ,long style = wxDEFAULT_DIALOG_STYLE
- ,const wxString& name = wxDialogNameStr
- )
+ // full ctor
+ wxDialog(wxWindow *parent, wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ 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
- ,const wxString& title
- , // bool modal = FALSE, // TODO make this a window style?
- const wxPoint& pos = wxDefaultPosition
- ,const wxSize& size = wxDefaultSize
- ,long style = wxDEFAULT_DIALOG_STYLE
- ,const wxString& name = wxDialogNameStr
+ bool Create( wxWindow* pParent
+ ,wxWindowID vId
+ ,const wxString& rsTitle
+ ,const wxPoint& rPos = wxDefaultPosition
+ ,const wxSize& rSize = wxDefaultSize
+ ,long lStyle = wxDEFAULT_DIALOG_STYLE
+ ,const wxString& rsName = wxDialogNameStr
);
+ virtual ~wxDialog();
- ~wxDialog();
-
- virtual bool Destroy();
-
- virtual void DoSetClientSize(int width, int height);
-
- virtual void GetPosition(int *x, int *y) const;
-
- bool Show(bool show);
- bool IsShown() const;
- void Iconize(bool iconize);
-
-#if WXWIN_COMPATIBILITY
- bool Iconized() const { return IsIconized(); };
-#endif
-
- virtual bool IsIconized() const;
- void Fit();
+ // return true if we're showing the dialog modally
+ virtual bool IsModal() const { return m_modalData != NULL; }
- void SetTitle(const wxString& title);
- wxString GetTitle() const ;
+ // show the dialog modally and return the value passed to EndModal()
+ virtual int ShowModal();
- void OnSize(wxSizeEvent& event);
- bool OnClose();
- 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;
-
- // For now, same as Show(TRUE) but returns return code
- virtual int ShowModal();
+ // may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
- // Standard buttons
- void OnOK(wxCommandEvent& event);
- void OnApply(wxCommandEvent& event);
- void OnCancel(wxCommandEvent& event);
-
- // Responds to colour changes
- void OnSysColourChanged(wxSysColourChangedEvent& event);
-
- // implementation
- // --------------
- virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
- virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
- bool IsModalShowing() const { return m_modalShowing; }
-
- // tooltip management
-#if wxUSE_TOOLTIPS
- WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
- void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
-#endif // tooltips
+ // implementation only from now on
+ // -------------------------------
+
+ // override some base class virtuals
+ virtual bool Show(bool show = true);
+
+ //
+ // Callbacks
+ //
+ virtual MRESULT OS2WindowProc( WXUINT uMessage
+ ,WXWPARAM wParam
+ ,WXLPARAM lParam
+ );
+#if WXWIN_COMPATIBILITY_2_6
+
+ // Constructor with a modal flag, but no window id - the old convention
+ wxDEPRECATED( wxDialog( wxWindow* pParent
+ ,const wxString& rsTitle
+ ,bool bModal
+ ,int nX = -1
+ ,int nY = -1
+ ,int nWidth = 500
+ ,int nHeight = 500
+ ,long lStyle = wxDEFAULT_DIALOG_STYLE
+ ,const wxString& rsName = wxDialogNameStr
+ ) );
+
+ // just call Show() or ShowModal()
+ wxDEPRECATED( void SetModal(bool bFlag) );
+
+ // use IsModal()
+ wxDEPRECATED( bool IsModalShowing() const );
+
+#endif // WXWIN_COMPATIBILITY_2_6
protected:
- bool m_modalShowing;
- WXHWND m_hwndOldFocus; // the window which had focus before we were shown
+ //
+ // Common part of all ctors
+ //
+ void Init(void);
private:
-#if wxUSE_TOOLTIPS
- WXHWND m_hwndToolTip;
-#endif // tooltips
+ wxWindow* m_pOldFocus;
+ bool m_endModalCalled; // allow for closing within InitDialog
-private:
+ // this pointer is non-NULL only while the modal event loop is running
+ wxDialogModalData *m_modalData;
+
+ //
+ // While we are showing a modal dialog we disable the other windows using
+ // this object
+ //
+ class wxWindowDisabler* m_pWindowDisabler;
-DECLARE_EVENT_TABLE()
-};
+ DECLARE_DYNAMIC_CLASS(wxDialog)
+ wxDECLARE_NO_COPY_CLASS(wxDialog);
+}; // end of CLASS wxDialog
-#endif
- // _WX_DIALOG_H_
+#endif // _WX_DIALOG_H_
projects / wxWidgets.git / blobdiff