added and documented SplitVolume() and GetPathTerminators(); corrected SetPath()...

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index cc40e39182aed2cddc88cc73e8019946ff7208ef..5be10c37d413e03144080fe1652710dccea5866a 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(NO_GCC_PRAGMA)

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


@@ -45,12 +45,12 @@ public:
     {
         Init();
 
     {
         Init();
 

-        Create(parent, -1, wxPoint(x, y), wxSize(width, height), style, name);
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);

     }
 
     // Constructor
     wxPanel(wxWindow *parent,
     }
 
     // Constructor
     wxPanel(wxWindow *parent,

-            wxWindowID id = -1,
+            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,


@@ -58,11 +58,11 @@ public:
     {
         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,


@@ -73,18 +73,20 @@ public:
     // implementation from now on
     // --------------------------
 
     // 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();
 
         // calls layout for layout constraints and sizers
     void OnSize(wxSizeEvent& event);
 
     virtual void InitDialog();
 

-#ifdef __WXUNIV__
-    virtual bool ProvidesBackground() { 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();
 
 protected:
     WX_DECLARE_CONTROL_CONTAINER();
 
 protected:


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

-    DECLARE_DYNAMIC_CLASS(wxPanel)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };