projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement GetPageText for the OSX WebKit implementation.
[wxWidgets.git]
/
include
/
wx
/
generic
/
colrdlgg.h
diff --git
a/include/wx/generic/colrdlgg.h
b/include/wx/generic/colrdlgg.h
index d219de8512fe5d567212dd7114a12d8a61928985..d792b7aac193f9241b90669d278287e4533c2c67 100644
(file)
--- a/
include/wx/generic/colrdlgg.h
+++ b/
include/wx/generic/colrdlgg.h
@@
-5,39
+5,39
@@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
-// Licence: wxWi
dget
s licence
+// Copyright: (c)
Julian Smart
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifndef _
_COLORDLGH_G_
_
-#define _
_COLORDLGH_G_
_
+#ifndef _
WX_COLORDLGG_H
_
+#define _
WX_COLORDLGG_H
_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colrdlgg.h"
-#endif
-
-#include "wx/setup.h"
#include "wx/gdicmn.h"
#include "wx/dialog.h"
#include "wx/gdicmn.h"
#include "wx/dialog.h"
-#include "wx/cmndata.h"
#define wxID_ADD_CUSTOM 3000
#define wxID_ADD_CUSTOM 3000
-#define wxID_RED_SLIDER 3001
-#define wxID_GREEN_SLIDER 3002
-#define wxID_BLUE_SLIDER 3003
-class WXDLLEXPORT wxSlider;
-class WXDLLEXPORT wxGenericColourDialog : public wxDialog
+#if wxUSE_SLIDER
+
+ #define wxID_RED_SLIDER 3001
+ #define wxID_GREEN_SLIDER 3002
+ #define wxID_BLUE_SLIDER 3003
+
+ class WXDLLIMPEXP_FWD_CORE wxSlider;
+
+#endif // wxUSE_SLIDER
+
+class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog
{
public:
wxGenericColourDialog();
wxGenericColourDialog(wxWindow *parent,
{
public:
wxGenericColourDialog();
wxGenericColourDialog(wxWindow *parent,
- wxColourData *data =
(wxColourData *)
NULL);
+ wxColourData *data = NULL);
virtual ~wxGenericColourDialog();
virtual ~wxGenericColourDialog();
- bool Create(wxWindow *parent, wxColourData *data =
(wxColourData *)
NULL);
+ bool Create(wxWindow *parent, wxColourData *data = NULL);
- wxColourData &GetColourData() { return colourData; }
+ wxColourData &GetColourData() { return
m_
colourData; }
virtual int ShowModal();
virtual int ShowModal();
@@
-59,54
+59,54
@@
public:
void OnAddCustom(wxCommandEvent& event);
void OnAddCustom(wxCommandEvent& event);
+#if wxUSE_SLIDER
void OnRedSlider(wxCommandEvent& event);
void OnGreenSlider(wxCommandEvent& event);
void OnBlueSlider(wxCommandEvent& event);
void OnRedSlider(wxCommandEvent& event);
void OnGreenSlider(wxCommandEvent& event);
void OnBlueSlider(wxCommandEvent& event);
+#endif // wxUSE_SLIDER
void OnCloseWindow(wxCloseEvent& event);
protected:
void OnCloseWindow(wxCloseEvent& event);
protected:
- wxColourData colourData;
- wxWindow *dialogParent;
+ wxColourData m_colourData;
// Area reserved for grids of colours
// Area reserved for grids of colours
- wxRect standardColoursRect;
- wxRect customColoursRect;
- wxRect singleCustomColourRect;
+ wxRect
m_
standardColoursRect;
+ wxRect
m_
customColoursRect;
+ wxRect
m_
singleCustomColourRect;
// Size of each colour rectangle
// Size of each colour rectangle
- wxPoint smallRectangleSize;
+ wxPoint
m_
smallRectangleSize;
// For single customizable colour
// For single customizable colour
- wxPoint customRectangleSize;
+ wxPoint
m_
customRectangleSize;
// Grid spacing (between rectangles)
// Grid spacing (between rectangles)
- int gridSpacing;
+ int
m_
gridSpacing;
// Section spacing (between left and right halves of dialog box)
// Section spacing (between left and right halves of dialog box)
- int sectionSpacing;
+ int
m_
sectionSpacing;
// 48 'standard' colours
// 48 'standard' colours
- wxColour standardColours[48];
+ wxColour
m_
standardColours[48];
// 16 'custom' colours
// 16 'custom' colours
- wxColour customColours[16];
-
- // One single custom colour (use sliders)
- wxColour singleCustomColour;
+ wxColour m_customColours[16];
// Which colour is selected? An index into one of the two areas.
// Which colour is selected? An index into one of the two areas.
- int colourSelection;
- int whichKind; // 1 for standard colours, 2 for custom colours,
+ int
m_
colourSelection;
+ int
m_
whichKind; // 1 for standard colours, 2 for custom colours,
- wxSlider *redSlider;
- wxSlider *greenSlider;
- wxSlider *blueSlider;
+#if wxUSE_SLIDER
+ wxSlider *m_redSlider;
+ wxSlider *m_greenSlider;
+ wxSlider *m_blueSlider;
+#endif // wxUSE_SLIDER
- int buttonY;
+ int
m_
buttonY;
- int okButtonX;
- int customButtonX;
+ int
m_
okButtonX;
+ int
m_
customButtonX;
// static bool colourDialogCancelled;
// static bool colourDialogCancelled;
@@
-114,10
+114,4
@@
protected:
DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
};
DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
};
-/* This shouldn't be necessary, we have a #define in wx/colordlg.h.
-#ifdef __WXGTK__
-typedef wxGenericColourDialog wxColourDialog;
-#endif
-*/
-
-#endif
+#endif // _WX_COLORDLGG_H_