projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced C++ comment with a C one
[wxWidgets.git]
/
include
/
wx
/
msw
/
dialog.h
diff --git
a/include/wx/msw/dialog.h
b/include/wx/msw/dialog.h
index bbe72cdf874126fc2d80b66f406414a7e318998c..ecb782a6683a68137ed3139a35dca54930e00cc7 100644
(file)
--- a/
include/wx/msw/dialog.h
+++ b/
include/wx/msw/dialog.h
@@
-18,7
+18,7
@@
#include "wx/panel.h"
#include "wx/panel.h"
-
WXDLLEXPORT_DATA(extern
const wxChar*) wxDialogNameStr;
+
extern WXDLLEXPORT_DATA(
const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxDialogModalData;
class WXDLLEXPORT wxDialogModalData;
@@
-63,7
+63,7
@@
public:
// -------------------------------
// override some base class virtuals
// -------------------------------
// override some base class virtuals
- virtual bool Show(bool show =
TRUE
);
+ virtual bool Show(bool show =
true
);
virtual void Raise();
virtual void Raise();
@@
-82,18
+82,13
@@
public:
// Windows callbacks
WXLRESULT 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
-
// obsolete methods
// ----------------
// use the other ctor
wxDEPRECATED( wxDialog(wxWindow *parent,
const wxString& title, bool modal,
// obsolete methods
// ----------------
// 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,
+ int x =
wxDefaultCoord, int y = wxDefaultCoord
, int width = 500, int height = 500,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) );
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr) );
@@
-113,6
+108,9
@@
protected:
// common part of all ctors
void Init();
// common part of all ctors
void Init();
+ // end either modal or modeless dialog
+ void EndDialog(int rc);
+
private:
wxWindow* m_oldFocus;
bool m_endModalCalled; // allow for closing within InitDialog
private:
wxWindow* m_oldFocus;
bool m_endModalCalled; // allow for closing within InitDialog