added template wxScopedArray<> too

[wxWidgets.git] / include / wx / univ / inphand.h

diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h
index d26a6e9ea452a7194e09f5209319f899ff392cc6..fd36787fe84605283b8fff8d1242d2e867aff06b 100644 (file)
--- a/include/wx/univ/inphand.h
+++ b/include/wx/univ/inphand.h
@@ -7,16 +7,12 @@
 // Created:     18.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     18.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_INPHAND_H_
 #define _WX_UNIV_INPHAND_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_INPHAND_H_
 #define _WX_UNIV_INPHAND_H_
 

-#ifdef __GNUG__
-    #pragma interface "inphand.h"
-#endif
-

 #include "wx/univ/inpcons.h"         // for wxControlAction(s)
 
 // ----------------------------------------------------------------------------
 #include "wx/univ/inpcons.h"         // for wxControlAction(s)
 
 // ----------------------------------------------------------------------------


@@ -35,18 +31,20 @@
 #define wxINP_HANDLER_SCROLLBAR         _T("scrollbar")
 #define wxINP_HANDLER_SLIDER            _T("slider")
 #define wxINP_HANDLER_SPINBTN           _T("spinbtn")
 #define wxINP_HANDLER_SCROLLBAR         _T("scrollbar")
 #define wxINP_HANDLER_SLIDER            _T("slider")
 #define wxINP_HANDLER_SPINBTN           _T("spinbtn")

+#define wxINP_HANDLER_STATUSBAR         _T("statusbar")

 #define wxINP_HANDLER_TEXTCTRL          _T("textctrl")
 #define wxINP_HANDLER_TEXTCTRL          _T("textctrl")

+#define wxINP_HANDLER_TOOLBAR           _T("toolbar")

 #define wxINP_HANDLER_TOPLEVEL          _T("toplevel")
 
 // ----------------------------------------------------------------------------
 // wxInputHandler: maps the events to the actions
 // ----------------------------------------------------------------------------
 
 #define wxINP_HANDLER_TOPLEVEL          _T("toplevel")
 
 // ----------------------------------------------------------------------------
 // wxInputHandler: maps the events to the actions
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxInputHandler : public wxObject
+class WXDLLIMPEXP_CORE wxInputHandler : public wxObject

 {
 public:
 {
 public:

-    // map a keyboard event to one or more actions (pressed == TRUE if the key
-    // was pressed, FALSE if released), returns TRUE if something was done
+    // map a keyboard event to one or more actions (pressed == true if the key
+    // was pressed, false if released), returns true if something was done

     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed) = 0;
     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed) = 0;


@@ -65,12 +63,12 @@ public:
     // HandleMouseMove() as the mouse maybe over the control without it having
     // focus
     //
     // HandleMouseMove() as the mouse maybe over the control without it having
     // focus
     //

-    // return TRUE to refresh the control, FALSE otherwise
+    // return true to refresh the control, false otherwise

     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
 
     // react to the app getting/losing activation
     //
     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
 
     // react to the app getting/losing activation
     //

-    // return TRUE to refresh the control, FALSE otherwise
+    // return true to refresh the control, false otherwise

     virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
 
     // virtual dtor for any base class
     virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
 
     // virtual dtor for any base class


@@ -82,7 +80,7 @@ public:
 // and also provides the way to chain input handlers together
 // ----------------------------------------------------------------------------
 
 // and also provides the way to chain input handlers together
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStdInputHandler : public wxInputHandler
+class WXDLLIMPEXP_CORE wxStdInputHandler : public wxInputHandler

 {
 public:
     wxStdInputHandler(wxInputHandler *handler) : m_handler(handler) { }
 {
 public:
     wxStdInputHandler(wxInputHandler *handler) : m_handler(handler) { }


@@ -92,23 +90,23 @@ public:
                            bool pressed)
     {
         return m_handler ? m_handler->HandleKey(consumer, event, pressed)
                            bool pressed)
     {
         return m_handler ? m_handler->HandleKey(consumer, event, pressed)

-                         : FALSE;
+                         : false;

     }
 
     virtual bool HandleMouse(wxInputConsumer *consumer,
                              const wxMouseEvent& event)
     {
     }
 
     virtual bool HandleMouse(wxInputConsumer *consumer,
                              const wxMouseEvent& event)
     {

-        return m_handler ? m_handler->HandleMouse(consumer, event) : FALSE;
+        return m_handler ? m_handler->HandleMouse(consumer, event) : false;

     }
 
     virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event)
     {
     }
 
     virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event)
     {

-        return m_handler ? m_handler->HandleMouseMove(consumer, event) : FALSE;
+        return m_handler ? m_handler->HandleMouseMove(consumer, event) : false;

     }
 
     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event)
     {
     }
 
     virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event)
     {

-        return m_handler ? m_handler->HandleFocus(consumer, event) : FALSE;
+        return m_handler ? m_handler->HandleFocus(consumer, event) : false;

     }
 
 private:
     }
 
 private: