In destructor: DestroyChildren() and make sure m_cocoaNSView is NULL so that

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 85f91ee81a39e7bbb0c581ac8e63ca3da5cf0fb9..947d9a4b22e4990cf306ff0e9145aa96b9cf47f4 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GENERIC_PANEL_H_
 #define _WX_GENERIC_PANEL_H_
 
 #ifndef _WX_GENERIC_PANEL_H_
 #define _WX_GENERIC_PANEL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "panelg.h"
 #endif
 
     #pragma interface "panelg.h"
 #endif
 


@@ -34,7 +34,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
 class WXDLLEXPORT wxPanel : public wxWindow
 {
 public:
 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)
 
     // 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)
             int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)

-        : m_container(this)

     {
         Init();
 
     {
         Init();
 


@@ -51,20 +50,19 @@ public:
 
     // Constructor
     wxPanel(wxWindow *parent,
 
     // Constructor
     wxPanel(wxWindow *parent,

-            wxWindowID id = -1,
+            wxWindowID winid = -1,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)

-        : m_container(this)

     {
         Init();
 
     {
         Init();
 

-        Create(parent, id, pos, size, style, name);
+        Create(parent, winid, pos, size, style, name);

     }
 
     // Pseudo ctor
     }
 
     // Pseudo ctor

-    bool Create(wxWindow *parent, wxWindowID id,
+    bool Create(wxWindow *parent, wxWindowID winid,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER,


@@ -75,16 +73,19 @@ public:
     // implementation from now on
     // --------------------------
 
     // 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);
 
         // 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; }
+#endif
+

     WX_DECLARE_CONTROL_CONTAINER();
 
 protected:
     WX_DECLARE_CONTROL_CONTAINER();
 
 protected:


@@ -92,7 +93,7 @@ protected:
     void Init();
 
 private:
     void Init();
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };