Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index dfda5d8ef0786838ad9a11ce35c1db6b4a382059..b6bc8cb2a442a5deadeef81e26044649a9e5a0ed 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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "panelg.h"
 #endif
 
@@ -50,7 +50,7 @@ public:
 
     // Constructor
     wxPanel(wxWindow *parent,
-            wxWindowID id = -1,
+            wxWindowID winid = -1,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
@@ -58,11 +58,11 @@ public:
     {
         Init();
 
-        Create(parent, id, pos, size, style, name);
+        Create(parent, winid, pos, size, style, name);
     }
 
     // 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,
@@ -79,6 +79,13 @@ public:
         // 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: