added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h
index 4920a8f32c4e002492e62c519d5ab5371526c27d..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
 


@@ -136,7 +136,6 @@ private:
     void classname::OnActivate(wxActivateEvent& event) \
     { \
         wxInputConsumer::OnActivate(event); \
     void classname::OnActivate(wxActivateEvent& event) \
     { \
         wxInputConsumer::OnActivate(event); \

-    } \
-
+    }

 
 #endif // _WX_UNIV_INPCONS_H_
 
 #endif // _WX_UNIV_INPCONS_H_