fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / dfb / window.h

diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index 89ee39d46f27b26bc95ca12e6451cbbc9fe7fc49..b12d07ab87643459da6fc678f831ca31f4925ee9 100644 (file)
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -81,12 +81,6 @@ public:
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;

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

 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget *dropTarget);


@@ -112,6 +106,11 @@ public:
 
 protected:
     // implement the base class pure virtuals
 
 protected:
     // implement the base class pure virtuals

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

     virtual void DoClientToScreen(int *x, int *y) const;
     virtual void DoScreenToClient(int *x, int *y) const;
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoClientToScreen(int *x, int *y) const;
     virtual void DoScreenToClient(int *x, int *y) const;
     virtual void DoGetPosition(int *x, int *y) const;


@@ -190,7 +189,7 @@ private:
     friend class wxWindowDCImpl; // for PaintOverlays
 
     DECLARE_DYNAMIC_CLASS(wxWindowDFB)
     friend class wxWindowDCImpl; // for PaintOverlays
 
     DECLARE_DYNAMIC_CLASS(wxWindowDFB)

-    DECLARE_NO_COPY_CLASS(wxWindowDFB)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDFB);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };