Compilation fix for VC++ 5 and 6

[wxWidgets.git] / include / wx / xrc / xh_combo.h

diff --git a/include/wx/xrc/xh_combo.h b/include/wx/xrc/xh_combo.h
index 2128d953b550eebe187ae6b83c59c2c5e9e5e50f..cf894b87f683801885f3fa0c284f922a744156db 100644 (file)
--- a/include/wx/xrc/xh_combo.h
+++ b/include/wx/xrc/xh_combo.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_COMBO_H_
 #define _WX_XH_COMBO_H_
 
 #ifndef _WX_XH_COMBO_H_
 #define _WX_XH_COMBO_H_
 

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

 #pragma interface "xh_combo.h"
 #endif
 
 #pragma interface "xh_combo.h"
 #endif
 


@@ -19,8 +19,9 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-class WXXMLDLLEXPORT wxComboBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler

 {
 {

+DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)

 public:
     wxComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxComboBoxXmlHandler();
     virtual wxObject *DoCreateResource();