projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied Greg's refinment of hist treectrl patch
[wxWidgets.git]
/
include
/
wx
/
msw
/
colordlg.h
diff --git
a/include/wx/msw/colordlg.h
b/include/wx/msw/colordlg.h
index 5643ef6f2f32b3e1a86133ce4f2a1211121db405..cf93a514efd0ed7de6f4926bdb44b6a215925f7d 100644
(file)
--- a/
include/wx/msw/colordlg.h
+++ b/
include/wx/msw/colordlg.h
@@
-1,12
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: colordlg.h
+// Name:
wx/msw/
colordlg.h
// Purpose: wxColourDialog class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxColourDialog class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COLORDLG_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COLORDLG_H_
@@
-20,25
+20,37
@@
#include "wx/dialog.h"
#include "wx/cmndata.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
-/
*
- * COLOUR DIALOG
- */
+/
/ ----------------------------------------------------------------------------
+// wxColourDialog: dialog for choosing a colours
+// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxColourDialog: public wxDialog
+class WXDLLEXPORT wxColourDialog
: public wxDialog
{
{
-DECLARE_DYNAMIC_CLASS(wxColourDialog)
public:
public:
- wxColourDialog(
void
);
+ wxColourDialog();
wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
bool Create(wxWindow *parent, wxColourData *data = NULL);
wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
bool Create(wxWindow *parent, wxColourData *data = NULL);
- int ShowModal(void);
- wxColourData& GetColourData(void) { return m_colourData; }
+ wxColourData& GetColourData() { return m_colourData; }
+
+ // override some base class virtuals
+ virtual void SetTitle(const wxString& title);
+ virtual wxString GetTitle();
+
+ virtual int ShowModal();
protected:
protected:
+ 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);
+
wxColourData m_colourData;
wxColourData m_colourData;
- wxWindow* m_dialogParent;
+ wxString m_title;
+
+ DECLARE_DYNAMIC_CLASS(wxColourDialog)
};
#endif
};
#endif