X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/univ/inphand.h

diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h
index 6ddd55fcf6..5e09bebf1f 100644
--- a/include/wx/univ/inphand.h
+++ b/include/wx/univ/inphand.h
@@ -13,10 +13,6 @@
 #ifndef _WX_UNIV_INPHAND_H_
 #define _WX_UNIV_INPHAND_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "inphand.h"
-#endif
-
 #include "wx/univ/inpcons.h"         // for wxControlAction(s)
 
 // ----------------------------------------------------------------------------
@@ -24,27 +20,27 @@
 // wxTheme::GetInputHandler()
 // ----------------------------------------------------------------------------
 
-#define wxINP_HANDLER_DEFAULT           _T("")
-#define wxINP_HANDLER_BUTTON            _T("button")
-#define wxINP_HANDLER_CHECKBOX          _T("checkbox")
-#define wxINP_HANDLER_CHECKLISTBOX      _T("checklistbox")
-#define wxINP_HANDLER_COMBOBOX          _T("combobox")
-#define wxINP_HANDLER_LISTBOX           _T("listbox")
-#define wxINP_HANDLER_NOTEBOOK          _T("notebook")
-#define wxINP_HANDLER_RADIOBTN          _T("radiobtn")
-#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_TOOLBAR           _T("toolbar")
-#define wxINP_HANDLER_TOPLEVEL          _T("toplevel")
+#define wxINP_HANDLER_DEFAULT           wxT("")
+#define wxINP_HANDLER_BUTTON            wxT("button")
+#define wxINP_HANDLER_CHECKBOX          wxT("checkbox")
+#define wxINP_HANDLER_CHECKLISTBOX      wxT("checklistbox")
+#define wxINP_HANDLER_COMBOBOX          wxT("combobox")
+#define wxINP_HANDLER_LISTBOX           wxT("listbox")
+#define wxINP_HANDLER_NOTEBOOK          wxT("notebook")
+#define wxINP_HANDLER_RADIOBTN          wxT("radiobtn")
+#define wxINP_HANDLER_SCROLLBAR         wxT("scrollbar")
+#define wxINP_HANDLER_SLIDER            wxT("slider")
+#define wxINP_HANDLER_SPINBTN           wxT("spinbtn")
+#define wxINP_HANDLER_STATUSBAR         wxT("statusbar")
+#define wxINP_HANDLER_TEXTCTRL          wxT("textctrl")
+#define wxINP_HANDLER_TOOLBAR           wxT("toolbar")
+#define wxINP_HANDLER_TOPLEVEL          wxT("toplevel")
 
 // ----------------------------------------------------------------------------
 // wxInputHandler: maps the events to the actions
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxInputHandler : public wxObject
+class WXDLLIMPEXP_CORE wxInputHandler : public wxObject
 {
 public:
     // map a keyboard event to one or more actions (pressed == true if the key
@@ -84,7 +80,7 @@ public:
 // 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) { }