Fix for unhiding the other version of the base class HitTest

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

diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h
index d56616c53a68040c885e0adca05bfe03c3e25711..5be10c37d413e03144080fe1652710dccea5866a 100644 (file)
--- a/include/wx/generic/panelg.h
+++ b/include/wx/generic/panelg.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PANEL_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_PANEL_H_


@@ -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 winid = -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,


@@ -73,23 +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();
 
 #ifdef __WXUNIVERSAL__
         // 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; }
+    virtual bool IsCanvasWindow() const { return true; }
+    virtual bool ProvidesBackground() const { return true; }

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

-    
+

     WX_DECLARE_CONTROL_CONTAINER();
 
 protected:
     WX_DECLARE_CONTROL_CONTAINER();
 
 protected: