X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index 28852dd454..be02bf70e2 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -5,17 +5,13 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GENERIC_PANEL_H_ #define _WX_GENERIC_PANEL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "panelg.h" -#endif - // ---------------------------------------------------------------------------- // headers and forward declarations // ---------------------------------------------------------------------------- @@ -25,7 +21,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 +41,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, @@ -62,7 +58,8 @@ public: } // Pseudo ctor - bool Create(wxWindow *parent, wxWindowID winid, + bool Create(wxWindow *parent, + wxWindowID winid = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, @@ -73,23 +70,16 @@ 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; } #endif - virtual void ApplyParentThemeBackground(const wxColour& bg) - { SetBackgroundColour(bg); } - WX_DECLARE_CONTROL_CONTAINER(); protected: