wxAppTraits::SetLocale() is wxUSE_INTL=1 only

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 7ed817ac56287996d8f05d625435aec2c979d3d2..3873241c17a6b0e4af03aec9816ae05c788b2e28 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -68,7 +68,8 @@ protected:
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
-                                wxFont *theFont = (wxFont *) NULL) const;
+                                const wxFont *theFont = (wxFont *) NULL) const;
+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region );
 
@@ -99,8 +100,6 @@ public:
     virtual void SetDeviceOrigin( wxCoord x, wxCoord y );
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
 
-    virtual GdkWindow* GetGDKWindow() const { return m_window; }
-
 // protected:
     // implementation
     // --------------
@@ -125,10 +124,9 @@ public:
     void SetUpDC();
     void Destroy();
     
-protected:
     virtual void ComputeScaleAndOrigin();
 
-    GdkWindow *GetWindow() { return m_window; }
+    virtual GdkWindow *GetGDKWindow() const { return m_window; }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowDC)