Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / generic / colrdlgg.h

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index d9a7a369988efa7cb1fe338238f87f2517570c98..d792b7aac193f9241b90669d278287e4533c2c67 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -9,17 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows 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
 


@@ -29,21 +23,21 @@
     #define wxID_GREEN_SLIDER   3002
     #define wxID_BLUE_SLIDER    3003
 
     #define wxID_GREEN_SLIDER   3002
     #define wxID_BLUE_SLIDER    3003
 

-    class WXDLLEXPORT wxSlider;
+    class WXDLLIMPEXP_FWD_CORE wxSlider;

 
 #endif // wxUSE_SLIDER
 
 
 #endif // wxUSE_SLIDER
 

-class WXDLLEXPORT wxGenericColourDialog : public wxDialog
+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();
 


@@ -74,46 +68,45 @@ public:
     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];
+    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,

 
 #if wxUSE_SLIDER
 
 #if wxUSE_SLIDER

-    wxSlider *redSlider;
-    wxSlider *greenSlider;
-    wxSlider *blueSlider;
+    wxSlider *m_redSlider;
+    wxSlider *m_greenSlider;
+    wxSlider *m_blueSlider;

 #endif // wxUSE_SLIDER
 
 #endif // wxUSE_SLIDER
 

-    int buttonY;
+    int m_buttonY;

 
 

-    int okButtonX;
-    int customButtonX;
+    int m_okButtonX;
+    int m_customButtonX;

 
     //  static bool colourDialogCancelled;
 
 
     //  static bool colourDialogCancelled;
 


@@ -121,4 +114,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
 };
 

-#endif
+#endif // _WX_COLORDLGG_H_