projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed redundant code
[wxWidgets.git]
/
include
/
wx
/
msw
/
dialog.h
diff --git
a/include/wx/msw/dialog.h
b/include/wx/msw/dialog.h
index f7a07592f8bac109087f26a00de20b415d873f93..9e13ae773fa3049152c599f84859369aa3f163ea 100644
(file)
--- a/
include/wx/msw/dialog.h
+++ b/
include/wx/msw/dialog.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name:
wx/msw/
dialog.h
// Purpose: wxDialog class
// Author: Julian Smart
// Modified by:
// Purpose: wxDialog class
// Author: Julian Smart
// Modified by:
@@
-23,10
+23,8
@@
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
// Dialog boxes
class WXDLLEXPORT wxDialog : public wxDialogBase
{
// Dialog boxes
class WXDLLEXPORT wxDialog : public wxDialogBase
{
- DECLARE_DYNAMIC_CLASS(wxDialog)
-
public:
public:
- wxDialog()
;
+ wxDialog()
{ Init(); }
// Constructor with a modal flag, but no window id - the old convention
wxDialog(wxWindow *parent,
// Constructor with a modal flag, but no window id - the old convention
wxDialog(wxWindow *parent,
@@
-58,45
+56,31
@@
public:
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr);
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr);
- ~wxDialog();
-
- virtual bool Destroy();
+ virtual ~wxDialog();
- virtual void DoSetClientSize(int width, int height);
+ void SetModal(bool flag);
+ virtual bool IsModal() const;
- virtual void GetPosition(int *x, int *y) const;
+ // For now, same as Show(TRUE) but returns return code
+ 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
+ // returns TRUE if we're in a modal loop
+ bool IsModalShowing() const;
- virtual bool IsIconized() const;
- void Fit();
+ // implementation only from now on
+ // -------------------------------
- virtual bool IsTopLevel() const { return TRUE; }
-
- void SetTitle(const wxString& title);
- wxString GetTitle() const ;
+ // override some base class virtuals
+ virtual bool Show(bool show);
- void OnSize(wxSizeEvent& event);
+ // event handlers
bool OnClose();
void OnCharHook(wxKeyEvent& event);
bool OnClose();
void OnCharHook(wxKeyEvent& event);
- void OnPaint(wxPaintEvent& event);
void OnCloseWindow(wxCloseEvent& 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();
- virtual void EndModal(int retCode);
-
// Standard buttons
void OnOK(wxCommandEvent& event);
void OnApply(wxCommandEvent& event);
// Standard buttons
void OnOK(wxCommandEvent& event);
void OnApply(wxCommandEvent& event);
@@
-105,32
+89,29
@@
public:
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
- // implementation
- // --------------
-
+ // Windows callbacks
long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
long 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);
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
+#endif // wxUSE_CTL3D
protected:
protected:
- bool m_modalShowing;
- WXHWND m_hwndOldFocus; // the window which had focus before we were shown
+ // show modal dialog and enter modal loop
+ void DoShowModal();
-private:
-#if wxUSE_TOOLTIPS
- WXHWND m_hwndToolTip;
-#endif // tooltips
+ // common part of all ctors
+ void Init();
private:
private:
+ wxWindow *m_oldFocus;
+
+ // while we are showing a modal dialog we disable the other windows using
+ // this object
+ class wxWindowDisabler *m_windowDisabler;
+
+ DECLARE_DYNAMIC_CLASS(wxDialog)
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};