X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e10daccc99be6d3ca7a206c69e94d3bfe6b03d..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/x11/window.h?ds=sidebyside diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h index 6c04d16eac..ef8e0eb58f 100644 --- 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() }; @@ -205,7 +203,7 @@ private: // optimisation, it will be reenabled as soon as the object goes out from scope. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxNoOptimize +class WXDLLIMPEXP_CORE wxNoOptimize { public: wxNoOptimize() { ms_count++; }