allow loading wxAnimationCtrl contents from stream (patch 1962344)

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index a9cb16b074d8d9db928b1fe7d82134ddfb31ebee..0304f15724c0e99b610d6267fe05d2dfc1bf774e 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.h
+// Name:        wx/gtk1/dcclient.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,35 +10,31 @@
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
-#include "wx/dc.h"
+#include "wx/gtk1/dc.h"

 #include "wx/window.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/window.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl;
+class WXDLLIMPEXP_FWD_CORE wxPaintDCImpl;
+class WXDLLIMPEXP_FWD_CORE wxClientDCImpl;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxWindowDC
+// wxWindowDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl

 {
 public:
 {
 public:

-    wxWindowDC();
-    wxWindowDC( wxWindow *win );
+    wxWindowDCImpl(wxDC *owner);
+    wxWindowDCImpl(wxDC *owner, wxWindow *win);

 
 

-    virtual ~wxWindowDC();
+    virtual ~wxWindowDCImpl();

 
 

-    virtual bool CanDrawBitmap() const { return TRUE; }
-    virtual bool CanGetTextExtent() const { return TRUE; }
+    virtual bool CanDrawBitmap() const { return true; }
+    virtual bool CanGetTextExtent() const { return true; }

 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;


@@ -65,11 +61,11 @@ protected:
 
     virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
 
     virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
     virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,

-                               bool useMask = FALSE );
+                               bool useMask = false );

 
     virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                         int logical_func = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );
+                         int logical_func = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );

 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,


@@ -78,7 +74,7 @@ protected:
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,

-                                wxFont *theFont = (wxFont *) NULL) const;
+                                const wxFont *theFont = (wxFont *) NULL) const;

 
 public:
     virtual wxCoord GetCharWidth() const;
 
 public:
     virtual wxCoord GetCharWidth() const;


@@ -104,6 +100,8 @@ public:
     virtual wxSize GetPPI() const;
     virtual int GetDepth() const;
 
     virtual wxSize GetPPI() const;
     virtual int GetDepth() const;
 

+    virtual GdkWindow* GetGDKWindow() const { return m_window; }
+

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -118,52 +116,46 @@ public:
     wxWindow     *m_owner;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
     wxWindow     *m_owner;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;

-    
-    // PangoContext stuff for GTK 2.0
-#ifdef __WXGTK20__
-    PangoContext *m_context;
-    PangoFontDescription *m_fontdesc;
-#endif

 
     void SetUpDC();
     void Destroy();
 
     void SetUpDC();
     void Destroy();

-    void ComputeScaleAndOrigin();
+    virtual void ComputeScaleAndOrigin();

 
     GdkWindow *GetWindow() { return m_window; }
 
 private:
 
     GdkWindow *GetWindow() { return m_window; }
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
+    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxClientDC
+// wxClientDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl

 {
 public:
 {
 public:

-    wxClientDC() { }
-    wxClientDC( wxWindow *win );
+    wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
+    wxClientDCImpl(wxDC *owner, wxWindow *win);

 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
+    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxPaintDC
+// wxPaintDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl

 {
 public:
 {
 public:

-    wxPaintDC() { }
-    wxPaintDC( wxWindow *win );
+    wxPaintDCImpl(wxDC *owner) : wxClientDCImpl(owner) { }
+    wxPaintDCImpl(wxDC *owner, wxWindow *win);

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)

 };
 
 #endif // __GTKDCCLIENTH__
 };
 
 #endif // __GTKDCCLIENTH__