Missing exports.

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

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index 3dd5f19b508554ca14c59689c1234aa1023f3892..7f939a3ec9a58bd7a2872faae48c0fff8eb70ece 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcclient.h"
-#endif
-

 #include "wx/dc.h"
 #include "wx/region.h"
 
 #include "wx/dc.h"
 #include "wx/region.h"
 


@@ -23,17 +19,17 @@
 // fwd declarations
 // -----------------------------------------------------------------------------
 
 // fwd declarations
 // -----------------------------------------------------------------------------
 

-class wxWindow;
+class WXDLLIMPEXP_CORE wxWindow;

 
 

-class wxWindowDC;
-class wxPaintDC;
-class wxClientDC;
+class WXDLLIMPEXP_CORE wxWindowDC;
+class WXDLLIMPEXP_CORE wxPaintDC;
+class WXDLLIMPEXP_CORE wxClientDC;

 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxWindowDC
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxWindowDC();
 {
 public:
     wxWindowDC();


@@ -104,11 +100,6 @@ public:
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;

-    virtual void DoGetTextExtent(const wxString& string,
-        wxCoord *x, wxCoord *y,
-        wxCoord *descent = NULL,
-        wxCoord *externalLeading = NULL,
-        wxFont *theFont = NULL) const;

 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;


@@ -116,9 +107,16 @@ public:
     virtual void DestroyClippingRegion();
     WXWindow GetWindow() const { return m_window; }
 
     virtual void DestroyClippingRegion();
     WXWindow GetWindow() const { return m_window; }
 

+    virtual void ComputeScaleAndOrigin();
+

 protected:
     // implementation
     // --------------
 protected:
     // implementation
     // --------------

+    virtual void DoGetTextExtent(const wxString& string,
+        wxCoord *x, wxCoord *y,
+        wxCoord *descent = NULL,
+        wxCoord *externalLeading = NULL,
+        wxFont *theFont = NULL) const;

 
     WXDisplay    *m_display;
     WXWindow      m_window;
 
     WXDisplay    *m_display;
     WXWindow      m_window;


@@ -140,7 +138,6 @@ protected:
 
     void SetUpDC();
     void Destroy();
 
     void SetUpDC();
     void Destroy();

-    virtual void ComputeScaleAndOrigin();

 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)


@@ -150,7 +147,7 @@ private:
 // wxClientDC
 //-----------------------------------------------------------------------------
 
 // wxClientDC
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxClientDC() { }
 {
 public:
     wxClientDC() { }


@@ -167,7 +164,7 @@ private:
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxPaintDC() { }
 {
 public:
     wxPaintDC() { }