projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dummy implementation for copying bitmaps.
[wxWidgets.git]
/
include
/
wx
/
generic
/
colrdlgg.h
diff --git
a/include/wx/generic/colrdlgg.h
b/include/wx/generic/colrdlgg.h
index 1b5bae611bba83b730bbe8f93df5ccfdaef06040..06feb75ffab0a40b8d5ac46430e12ec46c6f9aa3 100644
(file)
--- a/
include/wx/generic/colrdlgg.h
+++ b/
include/wx/generic/colrdlgg.h
@@
-5,28
+5,30
@@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
+// Copyright: (c)
Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __COLORDLGH_G__
#define __COLORDLGH_G__
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __COLORDLGH_G__
#define __COLORDLGH_G__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "colrdlgg.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
#include "wx/gdicmn.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#define wxID_ADD_CUSTOM 3000
#include "wx/gdicmn.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#define wxID_ADD_CUSTOM 3000
-#define wxID_RED_SLIDER 3001
-#define wxID_GREEN_SLIDER 3002
-#define wxID_BLUE_SLIDER 3003
-class WXDLLEXPORT wxSlider;
+#if wxUSE_SLIDER
+
+ #define wxID_RED_SLIDER 3001
+ #define wxID_GREEN_SLIDER 3002
+ #define wxID_BLUE_SLIDER 3003
+
+ class WXDLLEXPORT wxSlider;
+
+#endif // wxUSE_SLIDER
+
class WXDLLEXPORT wxGenericColourDialog : public wxDialog
{
public:
class WXDLLEXPORT wxGenericColourDialog : public wxDialog
{
public:
@@
-59,9
+61,11
@@
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);
void OnCloseWindow(wxCloseEvent& event);
@@
-92,16
+96,15
@@
protected:
// 16 'custom' colours
wxColour customColours[16];
// 16 'custom' colours
wxColour customColours[16];
- // One single custom colour (use sliders)
- wxColour singleCustomColour;
-
// Which colour is selected? An index into one of the two areas.
int colourSelection;
int whichKind; // 1 for standard colours, 2 for custom colours,
// Which colour is selected? An index into one of the two areas.
int colourSelection;
int whichKind; // 1 for standard colours, 2 for custom colours,
+#if wxUSE_SLIDER
wxSlider *redSlider;
wxSlider *greenSlider;
wxSlider *blueSlider;
wxSlider *redSlider;
wxSlider *greenSlider;
wxSlider *blueSlider;
+#endif // wxUSE_SLIDER
int buttonY;
int buttonY;
@@
-114,10
+117,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