reverted m_adjustMinSize change prepatory for a new approach to fix

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

diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h
index e7285541d162e4ba17b5c91a72805c0579bfe21b..4b085fce52b1907c3da37b15bb9ae7084290f123 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
 


@@ -49,7 +49,7 @@ public:
     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; }
 
     virtual bool GetVisible() { return m_visible; }
     virtual void SetVisible(bool v) { m_visible = v; }