added missing export declarations for wxGTK internal functions needed outside of...

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index fc7e52885e958f4432555176f60d074918fb9508..bd31d9b113df00ad19c7cda662557b385611f07d 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$
@@ -10,10 +10,6 @@
 #ifndef __GTKDCCLIENTH__
 #define __GTKDCCLIENTH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/dc.h"
 #include "wx/window.h"
 
@@ -21,15 +17,15 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxClientDC;
 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
-class wxWindowDC : public wxDC
+class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:
     wxWindowDC();
@@ -37,8 +33,8 @@ public:
 
     virtual ~wxWindowDC();
 
-    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;
@@ -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,
-                               bool useMask = FALSE );
+                               bool useMask = false );
 
     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,
@@ -78,7 +74,7 @@ protected:
                                 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;
@@ -104,6 +100,8 @@ public:
     virtual wxSize GetPPI() const;
     virtual int GetDepth() const;
 
+    virtual GdkWindow* GetGDKWindow() const { return m_window; }
+
     // implementation
     // --------------
 
@@ -118,17 +116,10 @@ public:
     wxWindow     *m_owner;
     wxRegion      m_currentClippingRegion;
     wxRegion      m_paintClippingRegion;
-    
-    // PangoContext stuff for GTK 2.0
-#ifdef __WXGTK20__
-    PangoContext *m_context;
-    PangoLayout *m_layout;
-    PangoFontDescription *m_fontdesc;
-#endif
 
     void SetUpDC();
     void Destroy();
-    void ComputeScaleAndOrigin();
+    virtual void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }
 
@@ -140,7 +131,7 @@ private:
 // wxClientDC
 //-----------------------------------------------------------------------------
 
-class wxClientDC : public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
 {
 public:
     wxClientDC() { }
@@ -157,7 +148,7 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-class wxPaintDC : public wxClientDC
+class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
 {
 public:
     wxPaintDC() { }