X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9390a202a8b9d67d393faf3e1323885e6a27c127..8870c26ecb03e87065fdb3617b8c47ca3c923a53:/include/wx/gtk/window.h

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index f7ca89a62d..0031aa27a1 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -55,6 +55,7 @@ class wxItemResource;
 #if wxUSE_DRAG_AND_DROP
 class wxDropTarget;
 #endif
+class wxToolTip;
 
 //-----------------------------------------------------------------------------
 // callback definition for inserting a window (internal)
@@ -77,8 +78,8 @@ extern const wxPoint wxDefaultPosition;
 class wxClientData
 {
 public:
-    wxClientData() { }
-    virtual ~wxClientData() { }
+  wxClientData() { }
+  virtual ~wxClientData() { }
 };
 
 //-----------------------------------------------------------------------------
@@ -168,13 +169,13 @@ public:
 
   virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
 
-  // Dialog units translations. Implemented in wincmn.cpp.
-  wxPoint ConvertPixelsToDialog(const wxPoint& pt) ;
-  wxPoint ConvertDialogToPixels(const wxPoint& pt) ;
-  inline wxSize ConvertPixelsToDialog(const wxSize& sz)
-  { wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
-  inline wxSize ConvertDialogToPixels(const wxSize& sz)
-  { wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
+  /* Dialog units translations. Implemented in wincmn.cpp. */
+  wxPoint ConvertPixelsToDialog( const wxPoint& pt );
+  wxPoint ConvertDialogToPixels( const wxPoint& pt );
+  inline wxSize ConvertPixelsToDialog( const wxSize& sz )
+      { wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
+  inline wxSize ConvertDialogToPixels( const wxSize& sz )
+      { wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
 
   void OnSize( wxSizeEvent &event );
 
@@ -198,8 +199,8 @@ public:
     { return m_parent; }
   wxWindow *GetGrandParent() const
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
-  void SetParent( wxWindow *p )
-    { m_parent = p; }
+  void SetParent( wxWindow *parent )
+    { m_parent = parent; }
   virtual wxWindow *ReParent( wxWindow *newParent );
 
   wxEvtHandler *GetEventHandler() const;
@@ -207,8 +208,8 @@ public:
   void PushEventHandler( wxEvtHandler *handler );
   wxEvtHandler *PopEventHandler( bool deleteHandler = FALSE );
 
-  virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
+  virtual wxValidator *GetValidator();
 
   virtual void SetClientObject( wxClientData *data );
   virtual wxClientData *GetClientObject();
@@ -225,9 +226,13 @@ public:
   wxWindowID GetId() const;
 
   void SetCursor( const wxCursor &cursor );
-
+  
   void WarpPointer(int x, int y);
   
+  virtual void SetToolTip( const wxString &tip );
+  virtual void SetToolTip( wxToolTip *tip );
+  virtual wxToolTip& GetToolTip();
+
   virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
   virtual void Clear();
 
@@ -359,6 +364,7 @@ public:
   wxAcceleratorTable   m_acceleratorTable;
   wxClientData        *m_clientObject;
   void                *m_clientData;
+  wxToolTip           *m_toolTip;
 
   GtkWidget           *m_widget;
   GtkWidget           *m_wxwindow;