wxTipWindow can now derived from wxFrame if not wxUSE_POPUPWIN, or

wxPopupTransientWindow otherwise.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/chkconf.h

@@ -877,14 +877,5 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
-#if wxUSE_TIPWINDOW && !wxUSE_POPUPWIN
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxTipWindow requires wxPopupWindow"
-#   else
-#       undef wxUSE_POPUPWIN
-#       define wxUSE_POPUPWIN 1
-#   endif
-#endif /* wxUSE_TIPWINDOW */
-
 #endif /* wxUSE_GUI */
 

include/wx/tipwin.h

@@ -17,16 +17,25 @@
     #pragma interface "tipwin.h"
 #endif
 
-#include "wx/popupwin.h"
+#if wxUSE_TIPWINDOW
 
 #if wxUSE_POPUPWIN
+#include "wx/popupwin.h"
+#else
+#include "wx/frame.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
+#if wxUSE_POPUPWIN
 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.
@@ -37,15 +46,15 @@ public:
 
     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 OnPaint(wxPaintEvent& event);
+#if !wxUSE_POPUPWIN
+    void OnActivate(wxActivateEvent& event);
+    void OnKillFocus(wxFocusEvent& event);
+#endif
 
 private:
     wxArrayString m_textLines;
@@ -55,7 +64,5 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_POPUPWIN
-
+#endif // wxUSE_TIPWINDOW
 #endif // _WX_TIPWIN_H_
-