move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/xrc/xh_gauge.h b/include/wx/xrc/xh_gauge.h
index 18e9354f99ae688f18fab300cc621d5091e3a2dd..9aa45d921a2e34365ebf41d22fa250d55f58027c 100644 (file)
--- a/include/wx/xrc/xh_gauge.h
+++ b/include/wx/xrc/xh_gauge.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_gauge.h
+// Name:        wx/xrc/xh_gauge.h

 // Purpose:     XML resource handler for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Purpose:     XML resource handler for wxGauge
 // Author:      Bob Mitchell
 // Created:     2000/03/21


@@ -11,20 +11,13 @@
 #ifndef _WX_XH_GAUGE_H_
 #define _WX_XH_GAUGE_H_
 
 #ifndef _WX_XH_GAUGE_H_
 #define _WX_XH_GAUGE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_gauge.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_GAUGE
-

 #include "wx/xrc/xmlres.h"
 
 #include "wx/xrc/xmlres.h"
 

+#if wxUSE_XRC && wxUSE_GAUGE

 
 

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

 {
 {

-       DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)

     enum
     {
         wxGAUGE_DEFAULT_RANGE = 100
     enum
     {
         wxGAUGE_DEFAULT_RANGE = 100


@@ -36,6 +29,6 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
     virtual bool CanHandle(wxXmlNode *node);
 };
 

-#endif
+#endif // wxUSE_XRC && wxUSE_GAUGE

 
 #endif // _WX_XH_GAUGE_H_
 
 #endif // _WX_XH_GAUGE_H_