X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5419957e5794f2d10f4e125f77b2c2e2cd222d6..284b4c8866ab36694b6ec2a308690bba4db4fed2:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index dac3a81ea2..35dc8fd95e 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -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() };