use CXXFLAGS instead of CFLAGS in several places now that the tests are done using...

[wxWidgets.git] / contrib / include / wx / ogl / misc.h

diff --git a/contrib/include/wx/ogl/misc.h b/contrib/include/wx/ogl/misc.h
index 70416d30e48e41c53f6fcf56cac228e69c6db128..37eec855956dc255f995f5e9d2192a9993246f0c 100644 (file)
--- a/contrib/include/wx/ogl/misc.h
+++ b/contrib/include/wx/ogl/misc.h
@@ -6,16 +6,12 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_MISC_H_
 #define _OGL_MISC_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_MISC_H_
 #define _OGL_MISC_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "misc.h"
-#endif
-

 
 // List to use when copying objects; may need to associate elements of new objects
 // with elements of old objects, e.g. when copying constraint.s
 
 // List to use when copying objects; may need to associate elements of new objects
 // with elements of old objects, e.g. when copying constraint.s


@@ -101,12 +97,12 @@ extern wxPen*           g_oglTransparentPen;
 extern wxBrush*         g_oglWhiteBackgroundBrush;
 extern wxPen*           g_oglBlackForegroundPen;
 
 extern wxBrush*         g_oglWhiteBackgroundBrush;
 extern wxPen*           g_oglBlackForegroundPen;
 

-extern wxFont*          oglMatchFont(int point_size);
+WXDLLIMPEXP_OGL wxFont*          oglMatchFont(int point_size);

 
 

-extern wxString         oglColourToHex(const wxColour& colour);
-extern wxColour         oglHexToColour(const wxString& hex);
-extern void             oglDecToHex(unsigned int dec, char *buf);
-extern unsigned int     oglHexToDec(char* buf);
+WXDLLIMPEXP_OGL wxString         oglColourToHex(const wxColour& colour);
+WXDLLIMPEXP_OGL wxColour         oglHexToColour(const wxString& hex);
+WXDLLIMPEXP_OGL void             oglDecToHex(unsigned int dec, char *buf);
+WXDLLIMPEXP_OGL unsigned int     oglHexToDec(char* buf);

 
 
 #endif
 
 
 #endif