added wxGetCCDefaultFont() returning the default icon font

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

diff --git a/include/wx/univ/inphand.h b/include/wx/univ/inphand.h
index d26a6e9ea452a7194e09f5209319f899ff392cc6..a28e9766936432c376c1b536b59edd011a9c4570 100644 (file)
--- a/include/wx/univ/inphand.h
+++ b/include/wx/univ/inphand.h
@@ -7,13 +7,13 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "inphand.h"
 #endif
 
     #pragma interface "inphand.h"
 #endif
 


@@ -35,7 +35,9 @@
 #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")
 
 // ----------------------------------------------------------------------------
 #define wxINP_HANDLER_TOPLEVEL          _T("toplevel")
 
 // ----------------------------------------------------------------------------