Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h
index bd099c0cd0cd72109ce88379fa63347113f0be1d..e370a4f6f689cd875feefff246d657348bef2bb4 100644 (file)
--- a/include/wx/univ/inpcons.h
+++ b/include/wx/univ/inpcons.h
@@ -6,13 +6,13 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_INPCONS_H_
 #define _WX_UNIV_INPCONS_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_INPCONS_H_
 #define _WX_UNIV_INPCONS_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "inpcons.h"
 #endif
 
     #pragma interface "inpcons.h"
 #endif
 


@@ -90,7 +90,9 @@ private: \
     void OnKeyDown(wxKeyEvent& event); \
     void OnKeyUp(wxKeyEvent& event); \
     void OnFocus(wxFocusEvent& event); \
     void OnKeyDown(wxKeyEvent& event); \
     void OnKeyUp(wxKeyEvent& event); \
     void OnFocus(wxFocusEvent& event); \

-    void OnActivate(wxActivateEvent& event);
+public: /* because of docview :-( */ \
+    void OnActivate(wxActivateEvent& event); \
+private:

 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_INPUT_CONSUMER(classname) \
 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_INPUT_CONSUMER(classname) \


@@ -136,5 +138,4 @@ private: \
         wxInputConsumer::OnActivate(event); \
     }
 
         wxInputConsumer::OnActivate(event); \
     }
 

-

 #endif // _WX_UNIV_INPCONS_H_
 #endif // _WX_UNIV_INPCONS_H_