SCROLLWIN instead of SCROLL again

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

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index f82865066b868315e1534840913f800355fbce72..2b9e0dc4e11e958b8ab4ff72c200446dec13d357 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -35,15 +35,15 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
   wxWindow *dialogParent;
 
   // Area reserved for grids of colours
   wxWindow *dialogParent;
 
   // Area reserved for grids of colours

-  wxRectangle standardColoursRect;
-  wxRectangle customColoursRect;
-  wxRectangle singleCustomColourRect;
+  wxRect standardColoursRect;
+  wxRect customColoursRect;
+  wxRect singleCustomColourRect;

 
   // Size of each colour rectangle
 
   // Size of each colour rectangle

-  wxIntPoint smallRectangleSize;
+  wxPoint smallRectangleSize;

 
   // For single customizable colour
 
   // For single customizable colour

-  wxIntPoint customRectangleSize;
+  wxPoint customRectangleSize;

 
   // Grid spacing (between rectangles)
   int gridSpacing;
 
   // Grid spacing (between rectangles)
   int gridSpacing;


@@ -76,20 +76,18 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
 //  static bool colourDialogCancelled;
  public:
   wxGenericColourDialog(void);
 //  static bool colourDialogCancelled;
  public:
   wxGenericColourDialog(void);

-  wxGenericColourDialog(wxWindow *parent, wxColourData *data = NULL);
+  wxGenericColourDialog(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);

   ~wxGenericColourDialog(void);
 
   ~wxGenericColourDialog(void);
 

-  bool Create(wxWindow *parent, wxColourData *data = NULL);
+  bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);

 
   int ShowModal(void);
 
   int ShowModal(void);

-  wxColourData GetColourData(void) { return colourData; }
+  wxColourData &GetColourData(void) { return colourData; }

 
   // Internal functions
   void OnMouseEvent(wxMouseEvent& event);
   void OnPaint(wxPaintEvent& event);
 
 
   // Internal functions
   void OnMouseEvent(wxMouseEvent& event);
   void OnPaint(wxPaintEvent& event);
 

-  bool OnClose(void);
-

   virtual void CalculateMeasurements(void);
   virtual void CreateWidgets(void);
   virtual void InitializeColours(void);
   virtual void CalculateMeasurements(void);
   virtual void CreateWidgets(void);
   virtual void InitializeColours(void);


@@ -102,22 +100,21 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
   virtual void OnBasicColourClick(int which);
   virtual void OnCustomColourClick(int which);
 
   virtual void OnBasicColourClick(int which);
   virtual void OnCustomColourClick(int which);
 

-/*
-  virtual void OnOk(void);
-  virtual void OnCancel(void);
-  virtual void OnAddCustom(void);
-*/

   void OnAddCustom(wxCommandEvent& event);
 
   void OnRedSlider(wxCommandEvent& event);
   void OnGreenSlider(wxCommandEvent& event);
   void OnBlueSlider(wxCommandEvent& event);
 
   void OnAddCustom(wxCommandEvent& event);
 
   void OnRedSlider(wxCommandEvent& event);
   void OnGreenSlider(wxCommandEvent& event);
   void OnBlueSlider(wxCommandEvent& event);
 

+  void OnCloseWindow(wxCloseEvent& event);
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-#ifdef __GTK__
+/* This shouldn't be necessary, we have a #define in wx/colordlg.h.
+#ifdef __WXGTK__

 typedef wxGenericColourDialog wxColourDialog;
 #endif
 typedef wxGenericColourDialog wxColourDialog;
 #endif

+*/

 
 #endif
 
 #endif