For clarity: wxComboPopupExtraEventHandler -> wxComboPopupEvtHandler (there is nothin...

[wxWidgets.git] / include / wx / generic / panelg.h

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index cbda3af503ac047261f6b30a14884bece0dc8661..4aa4c8c9886c87b898bd1ca4584d653938acc596 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -21,13 +21,13 @@
 
 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(); }
@@ -70,17 +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
 
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxWindowBase::GetDefaultBorder(); }
+#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();
 
@@ -88,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()
 };