Added missing | symbol

[wxWidgets.git] / include / wx / msw / window.h

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 9124feda189d47206f6027e6b526bf8cb5ede31e..212504c34fca9cd997335c14d409e1d8faf6e2fd 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -27,6 +27,7 @@
 #include "wx/list.h"
 #include "wx/region.h"
 #include "wx/msw/accel.h"
+#include "wx/intl.h"
 
 #define wxKEY_SHIFT     1
 #define wxKEY_CTRL      2
@@ -262,6 +263,7 @@ public:
   wxDropTarget *GetDropTarget() const { return m_pDropTarget; }
 #endif
 
+#if wxUSE_TOOLTIPS
   // tooltips
     // create a tooltip with this text
   void SetToolTip(const wxString &tip);
@@ -270,6 +272,8 @@ public:
     // get the current tooltip (may return NULL if none)
   wxToolTip* GetToolTip() const { return m_tooltip; }
 
+#endif // wxUSE_TOOLTIPS
+
   // Accept files for dragging
   virtual void DragAcceptFiles(bool accept);
 
@@ -462,6 +466,9 @@ public:
   void UpdateWindowUI();
 
   void OnEraseBackground(wxEraseEvent& event);
+  void OnKeyDown(wxKeyEvent& event);
+  void OnKeyUp(wxKeyEvent& event);
+  void OnPaint(wxPaintEvent& event);
   void OnChar(wxKeyEvent& event);
   void OnIdle(wxIdleEvent& event);
 
@@ -619,9 +626,10 @@ public:
   virtual void MSWOnMouseEnter(int x, int y, WXUINT flags);
   virtual void MSWOnMouseLeave(int x, int y, WXUINT flags);
 
-  virtual void MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
-  virtual void MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
-  virtual void MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
+  // These return TRUE if an event handler was found, FALSE otherwise (not processed)
+  virtual bool MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
+  virtual bool MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
+  virtual bool MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII = FALSE);
 
   virtual bool MSWOnActivate(int flag, bool minimized, WXHWND activate);
   virtual long MSWOnMDIActivate(long flag, WXHWND activate, WXHWND deactivate);
@@ -761,7 +769,9 @@ private:
     void Init();
 
     // the associated tooltip (may be NULL if none)
+#if wxUSE_TOOLTIPS
     wxToolTip *m_tooltip;
+#endif // tooltips
 
     DECLARE_EVENT_TABLE()
 };