X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..324c132b1e82843e34a05eba381e6150842786fc:/include/wx/gtk1/window.h diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 0f5f08f3cd..8d37e57148 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -10,6 +10,8 @@ #ifndef __GTKWINDOWH__ #define __GTKWINDOWH__ +typedef struct _GtkTooltips GtkTooltips; + // helper structure that holds class that holds GtkIMContext object and // some additional data needed for key events processing struct wxGtkIMData; @@ -84,16 +86,6 @@ public: virtual int GetCharHeight() const; virtual int GetCharWidth() const; - virtual void GetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = (const wxFont *) NULL) - const; - -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); -#endif // wxUSE_MENUS_NATIVE virtual void SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh = true ); @@ -122,7 +114,7 @@ public: // OnInternalIdle virtual void OnInternalIdle(); - // Internal represention of Update() + // Internal representation of Update() void GtkUpdate(); // For compatibility across platforms (not in event table) @@ -163,7 +155,7 @@ public: void GtkUpdateScrollbar(int orient); // Called from GTK signal handlers. it indicates that - // the layouting functions have to be called later on + // the layout functions have to be called later on // (i.e. in idle time, implemented in OnInternalIdle() ). void GtkUpdateSize() { m_sizeSet = false; } @@ -226,6 +218,16 @@ public: wxInsertChildFunction m_insertCallback; // 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; + +#if wxUSE_MENUS_NATIVE + virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); +#endif // wxUSE_MENUS_NATIVE + virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const;