ugh. Nesting the (per class) plugin sentries can require them to

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

diff --git a/include/wx/tipwin.h b/include/wx/tipwin.h
index 37591de4468b65db7ac4047bac4f008094e95348..3a82a5c064e2b97d673bd58f93cc93e68fbff4f8 100644 (file)
--- a/include/wx/tipwin.h
+++ b/include/wx/tipwin.h
@@ -17,13 +17,23 @@
     #pragma interface "tipwin.h"
 #endif
 
     #pragma interface "tipwin.h"
 #endif
 

+#if wxUSE_TIPWINDOW
+
+#if wxUSE_POPUPWIN
+#include "wx/popupwin.h"
+#else

 #include "wx/frame.h"
 #include "wx/frame.h"

+#endif

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

+#if wxUSE_POPUPWIN
+class WXDLLEXPORT wxTipWindow : public wxPopupTransientWindow
+#else

 class WXDLLEXPORT wxTipWindow : public wxFrame
 class WXDLLEXPORT wxTipWindow : public wxFrame

+#endif

 {
     friend class wxTipWindowView;
 public:
 {
     friend class wxTipWindowView;
 public:


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

+    void Close();
+

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

+#if !wxUSE_POPUPWIN

     void OnActivate(wxActivateEvent& event);
     void OnKillFocus(wxFocusEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnKillFocus(wxFocusEvent& event);

+#endif

 
 private:
     wxArrayString m_textLines;
 
 private:
     wxArrayString m_textLines;


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

+#endif // wxUSE_TIPWINDOW

 #endif // _WX_TIPWIN_H_
 #endif // _WX_TIPWIN_H_