X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc7a2a602b4bd9308be21bc07e40a680f483438e..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/colordlg.h diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index 86d4b3b983..91ac90090d 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -12,11 +12,7 @@ #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" @@ -24,11 +20,16 @@ // wxColourDialog: dialog for choosing a colours // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxColourDialog : public wxDialog +class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { 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); @@ -40,22 +41,36 @@ public: 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: + // 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 DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + virtual void DoMoveWindow(int x, int y, int width, int height); + virtual void DoCentre(int dir); +#endif // !(__SMARTPHONE__ && __WXWINCE__) 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_NO_COPY(wxColourDialog) }; -#endif - // _WX_COLORDLG_H_ +#endif // _WX_COLORDLG_H_