X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd507486e07b742bb7acb118811efd60ee027859..8397cab4dafee82a887785a80ab8f588a68d9f27:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index 9fbe9ceb26..75c666f08e 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -25,7 +25,7 @@ class WXDLLEXPORT wxControlContainer; -WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; // ---------------------------------------------------------------------------- // wxPanel contains other controls and implements TAB traversal between them @@ -45,12 +45,12 @@ public: { Init(); - Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name); + Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name); } // Constructor wxPanel(wxWindow *parent, - wxWindowID winid = -1, + wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, @@ -73,21 +73,20 @@ public: // implementation from now on // -------------------------- - // responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - // calls layout for layout constraints and sizers void OnSize(wxSizeEvent& event); virtual void InitDialog(); #ifdef __WXUNIVERSAL__ - virtual bool IsCanvasWindow() const { return TRUE; } - virtual bool ProvidesBackground() const { return TRUE; } + virtual bool IsCanvasWindow() const { return true; } + virtual bool ProvidesBackground() const { return true; } #endif - virtual bool CanApplyParentThemeBackground() const { return true; } - + virtual void ApplyParentThemeBackground(const wxColour& bg) + { SetBackgroundColour(bg); } + + WX_DECLARE_CONTROL_CONTAINER(); protected: