Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index b54d4df0fda6ef4258625f4487b1f2bfc499bb89..35dc8fd95ed6ada59521b55c1280cbec888f4cd5 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -40,10 +40,10 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
   wxRect singleCustomColourRect;
 
   // Size of each colour rectangle
-  wxIntPoint smallRectangleSize;
+  wxPoint smallRectangleSize;
 
   // For single customizable colour
-  wxIntPoint customRectangleSize;
+  wxPoint customRectangleSize;
 
   // Grid spacing (between rectangles)
   int gridSpacing;
@@ -82,14 +82,12 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
   bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
 
   int ShowModal(void);
-  wxColourData GetColourData(void) { return colourData; }
+  wxColourData &GetColourData(void) { return colourData; }
 
   // 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);
@@ -102,17 +100,14 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
   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 OnCloseWindow(wxCloseEvent& event);
+
 DECLARE_EVENT_TABLE()
 };