projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no changes, just update the copyright in the header
[wxWidgets.git]
/
include
/
wx
/
msw
/
colordlg.h
diff --git
a/include/wx/msw/colordlg.h
b/include/wx/msw/colordlg.h
index af068a631ece1b693080ba2a612a03fa992ca4b8..91ac90090dfd9559f55e7ad72b030631cf5142b1 100644
(file)
--- a/
include/wx/msw/colordlg.h
+++ b/
include/wx/msw/colordlg.h
@@
-12,11
+12,7
@@
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
-#ifdef __GNUG__
-#pragma interface "colordlg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
@@
-24,11
+20,16
@@
// wxColourDialog: dialog for choosing a colours
// ----------------------------------------------------------------------------
// wxColourDialog: dialog for choosing a colours
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxColourDialog : public wxDialog
+class WXDLL
IMPEXP_CORE
wxColourDialog : public wxDialog
{
public:
{
public:
- wxColourDialog();
- wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
+ wxColourDialog() { Init(); }
+ wxColourDialog(wxWindow *parent, wxColourData *data = NULL)
+ {
+ Init();
+
+ Create(parent, data);
+ }
bool Create(wxWindow *parent, wxColourData *data = NULL);
bool Create(wxWindow *parent, wxColourData *data = NULL);
@@
-40,22
+41,36
@@
public:
virtual int ShowModal();
virtual int ShowModal();
- virtual void DoGetPosition( int *x, int *y ) const;
+ // wxMSW-specific implementation from now on
+ // -----------------------------------------
+
+ // called from the hook procedure on WM_INITDIALOG reception
+ virtual void MSWOnInitDone(WXHWND hDlg);
protected:
protected:
+ // common part of all ctors
+ void Init();
+
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+ virtual void DoGetPosition( int *x, int *y ) const;
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetClientSize(int *width, int *height) const;
- virtual void Do
SetSize(int x, int y,
- int width, int height,
- int sizeFlags = wxSIZE_AUTO);
+ virtual void Do
MoveWindow(int x, int y, int width, int height);
+ virtual void DoCentre(int dir);
+#endif // !(__SMARTPHONE__ && __WXWINCE__)
wxColourData m_colourData;
wxString m_title;
wxColourData m_colourData;
wxString m_title;
- wxPoint m_pos;
+ // indicates that the dialog should be centered in this direction if non 0
+ // (set by DoCentre(), used by MSWOnInitDone())
+ int m_centreDir;
+
+ // true if DoMoveWindow() had been called
+ bool m_movedWindow;
+
- DECLARE_DYNAMIC_CLASS(wxColourDialog)
+ DECLARE_DYNAMIC_CLASS
_NO_COPY
(wxColourDialog)
};
};
-#endif
- // _WX_COLORDLG_H_
+#endif // _WX_COLORDLG_H_