X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..71e33cfbbddc293991796772c6e98a0e74ff826b:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index dba4981564..cbda3af503 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -12,10 +12,6 @@ #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 // ---------------------------------------------------------------------------- @@ -23,9 +19,9 @@ #include "wx/window.h" #include "wx/containr.h" -class WXDLLEXPORT wxControlContainer; +class WXDLLIMPEXP_FWD_CORE wxControlContainer; -extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[]; // ---------------------------------------------------------------------------- // wxPanel contains other controls and implements TAB traversal between them @@ -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, @@ -82,6 +79,8 @@ public: virtual bool IsCanvasWindow() const { return true; } #endif + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); } WX_DECLARE_CONTROL_CONTAINER();