X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..063155781d8b491052a2342f55058bc8a88a4497:/include/wx/generic/panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index c43ab9848e..4aa4c8c988 100644
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -19,15 +19,15 @@
 #include "wx/window.h"
 #include "wx/containr.h"
 
-class WXDLLEXPORT wxControlContainer;
+class WXDLLIMPEXP_FWD_CORE wxControlContainer;
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxPanel contains other controls and implements TAB traversal between them
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPanel : public wxWindow
+class WXDLLIMPEXP_CORE wxPanel : public wxWindow
 {
 public:
     wxPanel() { Init(); }
@@ -58,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,
@@ -69,15 +70,25 @@ public:
     // implementation from now on
     // --------------------------
 
-        // calls layout for layout constraints and sizers
-    void OnSize(wxSizeEvent& event);
-
     virtual void InitDialog();
 
 #ifdef __WXUNIVERSAL__
     virtual bool IsCanvasWindow() const { return true; }
 #endif
 
+#ifdef __WXMSW__
+    // This is a hack to support inheriting of background through child
+    // wxPanel: at least wxNotebook needs this under wxMSW as its background
+    // should apply to its children which are usually wxPanels which normally
+    // don't have a transparent background. Calling this function allows to
+    // change this for the panels which are used as notebook pages.
+    void MSWSetTransparentBackground(bool isTransparent = true)
+    {
+        m_isTransparent = isTransparent;
+    }
+
+    virtual bool HasTransparentBackground() { return m_isTransparent; }
+#endif // __WXMSW__
 
     WX_DECLARE_CONTROL_CONTAINER();
 
@@ -85,7 +96,14 @@ protected:
     // common part of all ctors
     void Init();
 
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); }
+
 private:
+#ifdef __WXMSW__
+    bool m_isTransparent;
+#endif // __WXMSW__
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
     DECLARE_EVENT_TABLE()
 };