removed wxABI_TESTS, they're irrelvant in 2.9

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index 5be10c37d413e03144080fe1652710dccea5866a..be02bf70e2721f463d4b12761504d8176311bd0a 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PANEL_H_
 #define _WX_GENERIC_PANEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "panelg.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers and forward declarations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers and forward declarations
 // ----------------------------------------------------------------------------


@@ -25,7 +21,7 @@
 
 class WXDLLEXPORT wxControlContainer;
 
 
 class WXDLLEXPORT wxControlContainer;
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxPanel contains other controls and implements TAB traversal between them
 
 // ----------------------------------------------------------------------------
 // wxPanel contains other controls and implements TAB traversal between them


@@ -62,7 +58,8 @@ public:
     }
 
     // Pseudo ctor
     }
 
     // Pseudo ctor

-    bool Create(wxWindow *parent, wxWindowID winid,
+    bool Create(wxWindow *parent,
+                wxWindowID winid = wxID_ANY,

                 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,


@@ -80,12 +77,8 @@ public:
 
 #ifdef __WXUNIVERSAL__
     virtual bool IsCanvasWindow() const { return true; }
 
 #ifdef __WXUNIVERSAL__
     virtual bool IsCanvasWindow() const { return true; }

-    virtual bool ProvidesBackground() const { return true; }

 #endif
 
 #endif
 

-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
-

 
     WX_DECLARE_CONTROL_CONTAINER();
 
 
     WX_DECLARE_CONTROL_CONTAINER();