Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index b28d6706e5c6fb3639173625ef64bcade3dc304e..ef8e0eb58fa968c13a8cfe9f38313d5a07629448 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -71,15 +71,8 @@ public:
 
     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;
 
-    virtual void ScrollWindow( int dx, int dy,
-        const wxRect* rect = (wxRect *) NULL );
+    virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
@@ -89,7 +82,7 @@ public:
     virtual void DragAcceptFiles(bool accept);
 
     // Get the unique identifier of a window
-    virtual WXWindow GetHandle() const { return GetMainWindow(); }
+    virtual WXWindow GetHandle() const { return X11GetMainWindow(); }
 
     // implementation from now on
     // --------------------------
@@ -98,7 +91,7 @@ public:
     // ---------
 
     // Get main X11 window
-    virtual WXWindow GetMainWindow() const;
+    virtual WXWindow X11GetMainWindow() const;
 
     // Get X11 window representing the client area
     virtual WXWindow GetClientAreaWindow() const;
@@ -165,6 +158,11 @@ protected:
     bool                  m_needsInputFocus; // Input focus set in OnIdle
 
     // implement the base class pure virtuals
+    virtual void DoGetTextExtent(const wxString& string,
+                                 int *x, int *y,
+                                 int *descent = NULL,
+                                 int *externalLeading = NULL,
+                                 const wxFont *font = 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;
@@ -190,7 +188,7 @@ private:
     void Init();
 
     DECLARE_DYNAMIC_CLASS(wxWindowX11)
-    DECLARE_NO_COPY_CLASS(wxWindowX11)
+    wxDECLARE_NO_COPY_CLASS(wxWindowX11);
     DECLARE_EVENT_TABLE()
 };