Hierarchy fixes; bug fix for tabg that was introduced somehow...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/tabg.h

@@ -85,6 +85,9 @@ protected:
 
 class WXDLLEXPORT wxTabLayer: public wxList
 {
+// Why did someone remove this, please?
+DECLARE_DYNAMIC_CLASS(wxTabLayer)
+  wxTabLayer():wxList() {}
 };
 
 /*

include/wx/msw/dcclient.h

@@ -18,19 +18,6 @@
 
 #include "wx/dc.h"
 
-class WXDLLEXPORT wxClientDC: public wxDC
-{
-  DECLARE_DYNAMIC_CLASS(wxClientDC)
-
- public:
-  wxClientDC(void);
-
-  // Create a DC corresponding to a canvas
-  wxClientDC(wxWindow *win);
-
-  ~wxClientDC(void);
-};
-
 class WXDLLEXPORT wxWindowDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxWindowDC)
@@ -44,7 +31,20 @@ class WXDLLEXPORT wxWindowDC: public wxDC
   ~wxWindowDC(void);
 };
 
-class WXDLLEXPORT wxPaintDC: public wxDC
+class WXDLLEXPORT wxClientDC: public wxWindowDC
+{
+  DECLARE_DYNAMIC_CLASS(wxClientDC)
+
+ public:
+  wxClientDC(void);
+
+  // Create a DC corresponding to a canvas
+  wxClientDC(wxWindow *win);
+
+  ~wxClientDC(void);
+};
+
+class WXDLLEXPORT wxPaintDC: public wxWindowDC
 {
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 

include/wx/msw/dcscreen.h

@@ -16,9 +16,9 @@
 #pragma interface "dcscreen.h"
 #endif
 
-#include "wx/dc.h"
+#include "wx/dcclient.h"
 
-class WXDLLEXPORT wxScreenDC: public wxDC
+class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {
   DECLARE_DYNAMIC_CLASS(wxScreenDC)
 

include/wx/msw/tbar95.h

@@ -44,10 +44,12 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
             const wxString& name = wxToolBarNameStr);
 
   // Call default behaviour
+/*
   void OnPaint(wxPaintEvent& event) { Default() ; }
   void OnSize(wxSizeEvent& event) { Default() ; }
-  void OnMouseEvent(wxMouseEvent& event) { Default() ; }
   void OnKillFocus(wxFocusEvent& event) { Default() ; }
+*/
+  void OnMouseEvent(wxMouseEvent& event);
 
   // Handle wxToolBar95 events
 

include/wx/stubs/dcclient.h

@@ -28,23 +28,16 @@ class WXDLLEXPORT wxWindow;
 // Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented differently.
 // On many platforms, however, they will be the same.
 
-typedef wxPaintDC wxClientDC;
-typedef wxPaintDC wxWindowDC;
-
-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxPaintDC: public wxDC
+class WXDLLEXPORT wxWindowDC: public wxDC
 {
-  DECLARE_DYNAMIC_CLASS(wxPaintDC)
+  DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
   public:
 
-    wxPaintDC(void);
-    wxPaintDC( wxWindow *win );
-    
-    ~wxPaintDC(void);
+    wxWindowDC(void);
+    wxWindowDC( wxWindow *win );
+
+    ~wxWindowDC(void);
     
     virtual void FloodFill( long x1, long y1, wxColour* col, int style=wxFLOOD_SURFACE );
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
@@ -97,5 +90,35 @@ class WXDLLEXPORT wxPaintDC: public wxDC
     virtual void DrawSpline( wxList *points );
 };
 
+//-----------------------------------------------------------------------------
+// wxPaintDC
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPaintDC: public wxWindowDC
+{
+  DECLARE_DYNAMIC_CLASS(wxPaintDC)
+
+  public:
+
+    wxPaintDC(void):wxWindowDC() {};
+    wxPaintDC( wxWindow *win ): wxWindowDC(win) {};
+
+};
+
+//-----------------------------------------------------------------------------
+// wxClientDC
+//-----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxClientDC: public wxWindowDC
+{
+  DECLARE_DYNAMIC_CLASS(wxClientDC)
+
+  public:
+
+    wxClientDC(void):wxWindowDC() {};
+    wxClientDC( wxWindow *win ): wxWindowDC(win) {};
+
+};
+
 #endif
     // _WX_DCCLIENT_H_

include/wx/stubs/dcscreen.h

@@ -18,7 +18,7 @@
 
 #include "wx/dcclient.h"
 
-class WXDLLEXPORT wxScreenDC: public wxPaintDC
+class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {
   DECLARE_DYNAMIC_CLASS(wxScreenDC)