Use the correct WXDLLEXPORT declaration.

[wxWidgets.git] / include / wx / msw / gdiobj.h

diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h
index e7285541d162e4ba17b5c91a72805c0579bfe21b..3d3d1b92093882344380f3dac6a3e967c0c51194 100644 (file)
--- a/include/wx/msw/gdiobj.h
+++ b/include/wx/msw/gdiobj.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GDIOBJ_H_
 #define _WX_GDIOBJ_H_
 
 #ifndef _WX_GDIOBJ_H_
 #define _WX_GDIOBJ_H_
 

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

     #pragma interface "gdiobj.h"
 #endif
 
     #pragma interface "gdiobj.h"
 #endif
 


@@ -36,26 +36,26 @@ class WXDLLEXPORT wxGDIRefData : public wxObjectRefData
 class WXDLLEXPORT wxGDIObject : public wxObject
 {
 public:
 class WXDLLEXPORT wxGDIObject : public wxObject
 {
 public:

-    wxGDIObject() { m_visible = FALSE; };
+    wxGDIObject() { m_visible = false; };

 
     // Creates the resource
 
     // Creates the resource

-    virtual bool RealizeResource() { return FALSE; };
+    virtual bool RealizeResource() { return false; };

 
     // Frees the resource
 
     // Frees the resource

-    virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; }
+    virtual bool FreeResource(bool WXUNUSED(force) = false) { return false; }

 
 

-    virtual bool IsFree() const { return FALSE; }
+    virtual bool IsFree() const { return false; }

 
     bool IsNull() const { return (m_refData == 0); }
 
     // Returns handle.
 
     bool IsNull() const { return (m_refData == 0); }
 
     // Returns handle.

-    virtual WXHANDLE GetResourceHandle() { return 0; }
+    virtual WXHANDLE GetResourceHandle() const { return 0; }

 
     virtual bool GetVisible() { return m_visible; }
     virtual void SetVisible(bool v) { m_visible = v; }
 
 protected:
 
     virtual bool GetVisible() { return m_visible; }
     virtual void SetVisible(bool v) { m_visible = v; }
 
 protected:

-    bool m_visible; // TRUE only if we should delete this object ourselves
+    bool m_visible; // true only if we should delete this object ourselves

 
 private:
     DECLARE_DYNAMIC_CLASS(wxGDIObject)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGDIObject)