Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/univ/colschem.h b/include/wx/univ/colschem.h
index 7e3f5d7333887c012e8c8dc832b07de4433f0a45..32e35af467125c08da7d8b1f8e933db9754a15f8 100644 (file)
--- a/include/wx/univ/colschem.h
+++ b/include/wx/univ/colschem.h
@@ -6,13 +6,13 @@
 // Created:     19.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     19.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_COLSCHEM_H_
 #define _WX_UNIV_COLSCHEM_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_COLSCHEM_H_
 #define _WX_UNIV_COLSCHEM_H_
 

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

     #pragma interface "colschem.h"
 #endif
 
     #pragma interface "colschem.h"
 #endif
 


@@ -57,6 +57,20 @@ public:
         SHADOW_HIGHLIGHT,
         SHADOW_IN,
         SHADOW_OUT,
         SHADOW_HIGHLIGHT,
         SHADOW_IN,
         SHADOW_OUT,

+        
+        // the titlebar background colours for the normal and focused states
+        TITLEBAR,
+        TITLEBAR_ACTIVE,
+        
+        // the titlebar text colours
+        TITLEBAR_TEXT,
+        TITLEBAR_ACTIVE_TEXT,
+        
+        // the default gauge fill colour
+        GAUGE,
+
+        // desktop background colour (only used by framebuffer ports)
+        DESKTOP,

 
         MAX
     };
 
         MAX
     };