Lots of updates for color dialog and sliders

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 85f91ee81a39e7bbb0c581ac8e63ca3da5cf0fb9..526efda1a7fa386817db02b2bc5fd31858f82434 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -34,7 +34,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
-    wxPanel() : m_container(this) { Init(); }
+    wxPanel() { Init(); }
 
     // Old-style constructor (no default values for coordinates to avoid
     // ambiguity with the new one)
@@ -42,7 +42,6 @@ public:
             int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
-        : m_container(this)
     {
         Init();
 
@@ -56,7 +55,6 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
-        : m_container(this)
     {
         Init();
 
@@ -75,16 +73,19 @@ public:
     // implementation from now on
     // --------------------------
 
-    // Sends an OnInitDialog event, which in turns transfers data to
-    // to the dialog via validators.
-    virtual void InitDialog();
-
         // 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() { return TRUE; }
+    virtual bool ProvidesBackground() { return TRUE; }
+#endif
+
     WX_DECLARE_CONTROL_CONTAINER();
 
 protected: