Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / panel.h

diff --git a/include/wx/panel.h b/include/wx/panel.h
index 74016c64f46e201f1d024520bccc34d0eed46050..8f22d180fe26698eadc4328c09d1032fd7bd70b2 100644 (file)
--- a/include/wx/panel.h
+++ b/include/wx/panel.h
@@ -28,10 +28,10 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
 // wxPanel contains other controls and implements TAB traversal between them
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPanelBase : public wxWindow
+class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>
 {
 public:
-    wxPanelBase();
+    wxPanelBase() { }
 
     // Derived classes should also provide this constructor:
     /*
@@ -52,31 +52,12 @@ public:
                 const wxString& name = wxPanelNameStr);
 
 
-    // Use the given bitmap to tile the background of this panel. This bitmap
-    // will show through any transparent children.
-    //
-    // Notice that you must not prevent the base class EVT_ERASE_BACKGROUND
-    // handler from running (i.e. not to handle this event yourself) for this
-    // to work.
-    void SetBackgroundBitmap(const wxBitmap& bmp)
-    {
-        DoSetBackgroundBitmap(bmp);
-    }
-
-
     // implementation from now on
     // --------------------------
 
     virtual void InitDialog();
 
-    WX_DECLARE_CONTROL_CONTAINER();
-
-protected:
-    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) = 0;
-
 private:
-    wxDECLARE_EVENT_TABLE();
-
     wxDECLARE_NO_COPY_CLASS(wxPanelBase);
 };