Removed conflicting wxEntry prototype

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

diff --git a/include/wx/xrc/xh_text.h b/include/wx/xrc/xh_text.h
index 6bd2b7d2850ac2a0dfd702e5a985679b737f7e2b..e9bfbf5251a96ffc791233e8ec32666d1ecdf2c3 100644 (file)
--- a/include/wx/xrc/xh_text.h
+++ b/include/wx/xrc/xh_text.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XH_TEXT_H_
 #define _WX_XH_TEXT_H_
 
 #ifndef _WX_XH_TEXT_H_
 #define _WX_XH_TEXT_H_
 

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

 #pragma interface "xh_text.h"
 #endif
 
 #pragma interface "xh_text.h"
 #endif
 


@@ -20,6 +20,7 @@
 
 class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {
 
 class WXXMLDLLEXPORT wxTextCtrlXmlHandler : public wxXmlResourceHandler
 {

+DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)

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