fixed bug with the caret positioning after SetValue() introduced by the last commit

[wxWidgets.git] / include / wx / tipwin.h

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index ce4e3ec69a60a153837749549a0d9b2fec8dcecd..3a82a5c064e2b97d673bd58f93cc93e68fbff4f8 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -17,15 +17,25 @@
     #pragma interface "tipwin.h"
 #endif
 
     #pragma interface "tipwin.h"
 #endif
 

-#include "wx/popupwin.h"
+#if wxUSE_TIPWINDOW

 
 #if wxUSE_POPUPWIN
 
 #if wxUSE_POPUPWIN

+#include "wx/popupwin.h"
+#else
+#include "wx/frame.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 

+#if wxUSE_POPUPWIN

 class WXDLLEXPORT wxTipWindow : public wxPopupTransientWindow
 class WXDLLEXPORT wxTipWindow : public wxPopupTransientWindow

+#else
+class WXDLLEXPORT wxTipWindow : public wxFrame
+#endif

 {
 {

+    friend class wxTipWindowView;

 public:
     // Supply windowPtr for it to null the given address
     // when the window has closed.
 public:
     // Supply windowPtr for it to null the given address
     // when the window has closed.


@@ -36,15 +46,15 @@ public:
 
     void SetTipWindowPtr(wxTipWindow** windowPtr) { m_windowPtr = windowPtr; }
 
 
     void SetTipWindowPtr(wxTipWindow** windowPtr) { m_windowPtr = windowPtr; }
 

-    // calculate the client rect we need to display the text
-    void Adjust(const wxString& text, wxCoord maxLength);
-

     void Close();
 
 protected:
     // event handlers
     void OnMouseClick(wxMouseEvent& event);
     void Close();
 
 protected:
     // event handlers
     void OnMouseClick(wxMouseEvent& event);

-    void OnPaint(wxPaintEvent& event);
+#if !wxUSE_POPUPWIN
+    void OnActivate(wxActivateEvent& event);
+    void OnKillFocus(wxFocusEvent& event);
+#endif

 
 private:
     wxArrayString m_textLines;
 
 private:
     wxArrayString m_textLines;


@@ -54,5 +64,5 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif // wxUSE_POPUPWIN
+#endif // wxUSE_TIPWINDOW

 #endif // _WX_TIPWIN_H_
 #endif // _WX_TIPWIN_H_