supporting clang memory management annotations

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 28852dd454c0bacfa86bfcaf1a214bc8fea3363c..6bd2ad6073c67ce8f2370818260ae7dcb5b2a568 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -5,101 +5,45 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_GENERIC_PANEL_H_
-#define _WX_GENERIC_PANEL_H_
+#ifndef _WX_GENERIC_PANELG_H_
+#define _WX_GENERIC_PANELG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "panelg.h"
-#endif
+#include "wx/bitmap.h"
 
-// ----------------------------------------------------------------------------
-// headers and forward declarations
-// ----------------------------------------------------------------------------
-
-#include "wx/window.h"
-#include "wx/containr.h"
-
-class WXDLLEXPORT wxControlContainer;
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
-
-// ----------------------------------------------------------------------------
-// wxPanel contains other controls and implements TAB traversal between them
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxPanel : public wxWindow
+class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
 {
 public:
-    wxPanel() { Init(); }
+    wxPanel() { }
 
-    // Old-style constructor (no default values for coordinates to avoid
-    // ambiguity with the new one)
+    // Constructor
     wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
+            wxWindowID winid = wxID_ANY,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Init();
-
-        Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
+        Create(parent, winid, pos, size, style, name);
     }
 
-    // Constructor
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_CONSTRUCTOR(
     wxPanel(wxWindow *parent,
-            wxWindowID winid = -1,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
+            int x, int y, int width, int height,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPanelNameStr)
     {
-        Init();
-
-        Create(parent, winid, pos, size, style, name);
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
     }
-
-    // Pseudo ctor
-    bool Create(wxWindow *parent, wxWindowID winid,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                const wxString& name = wxPanelNameStr);
-
-    virtual ~wxPanel();
-
-    // implementation from now on
-    // --------------------------
-
-        // 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
-
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
-
-    
-    WX_DECLARE_CONTROL_CONTAINER();
-
-protected:
-    // common part of all ctors
-    void Init();
+    )
+#endif // WXWIN_COMPATIBILITY_2_8
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
-    DECLARE_EVENT_TABLE()
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
 };
 
-#endif
-    // _WX_GENERIC_PANEL_H_
+#endif // _WX_GENERIC_PANELG_H_