X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f22cf8ddb6d4c75eee97d1320ba20f7c82753c8..695237bccd652c60deba347117ba5ab32067880c:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 942d2ed8ee..2b9e0dc4e1 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -88,8 +88,6 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog void OnMouseEvent(wxMouseEvent& event); void OnPaint(wxPaintEvent& event); - bool OnClose(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 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() }; +/* This shouldn't be necessary, we have a #define in wx/colordlg.h. #ifdef __WXGTK__ typedef wxGenericColourDialog wxColourDialog; #endif +*/ #endif