set eol-style

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

diff --git a/include/wx/x11/dcclient.h b/include/wx/x11/dcclient.h
index 1af2a6c7393fbf957121d81e7a1eb9fa695887f1..542606604b1991863984ba0e81e9d3cd7eddbcb4 100644 (file)
--- a/include/wx/x11/dcclient.h
+++ b/include/wx/x11/dcclient.h
@@ -19,11 +19,11 @@
 // fwd declarations
 // -----------------------------------------------------------------------------
 
 // fwd declarations
 // -----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

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

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


@@ -32,10 +32,10 @@ class WXDLLIMPEXP_CORE wxClientDC;
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:
 class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
 {
 public:

-    wxWindowDC();
+    wxWindowDC() { Init(); }

     wxWindowDC( wxWindow *win );
 
     wxWindowDC( wxWindow *win );
 

-    ~wxWindowDC();
+    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; }


@@ -100,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;


@@ -112,9 +107,18 @@ 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,
+        const wxFont *theFont = NULL) const;
+
+    void Init();

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


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

-    virtual void ComputeScaleAndOrigin();

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