Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / include / wx / stubs / dcclient.h

diff --git a/include/wx/stubs/dcclient.h b/include/wx/stubs/dcclient.h
index 2e28330adb1e4bcb3b27232979c577c2fc06a3eb..29e4e6f7a06c5b50c1b6ae3dd31415874eef2dbc 100644 (file)
--- a/include/wx/stubs/dcclient.h
+++ b/include/wx/stubs/dcclient.h
@@ -28,25 +28,18 @@ class WXDLLEXPORT wxWindow;
 // Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented differently.
 // On many platforms, however, they will be the same.
 
 // 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:
 
 
   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 void FloodFill( long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE );

     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
     virtual void DrawLine( long x1, long y1, long x2, long y2 );
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
     virtual void DrawLine( long x1, long y1, long x2, long y2 );


@@ -92,10 +85,41 @@ class WXDLLEXPORT wxPaintDC: public wxDC
     virtual void SetPalette( const wxPalette& palette );
     
     virtual void SetClippingRegion( long x, long y, long width, long height );
     virtual void SetPalette( const wxPalette& palette );
     
     virtual void SetClippingRegion( long x, long y, long width, long height );

+    virtual void SetClippingRegion( const wxRegion& region ) ;

     virtual void DestroyClippingRegion(void);
     
     virtual void DrawSpline( wxList *points );
 };
 
     virtual void DestroyClippingRegion(void);
     
     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_
 #endif
     // _WX_DCCLIENT_H_