1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/gtk1/gdiobj.h b/include/wx/gtk1/gdiobj.h
index ac8e8e94477b1a3364951d8b6d30cd28eff6dad6..d87d6b9542759b979f667daa3bd30f2fc85dde18 100644 (file)
--- a/include/wx/gtk1/gdiobj.h
+++ b/include/wx/gtk1/gdiobj.h
@@ -13,24 +13,26 @@
 
 #include "wx/object.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
 class wxGDIObject : public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxGDIObject)
-
 public:
-  inline wxGDIObject() { m_visible = FALSE; };
-  inline ~wxGDIObject() {};
+    inline wxGDIObject() { m_visible = FALSE; };
+    inline ~wxGDIObject() {}
+
+    virtual bool GetVisible() { return m_visible; }
+    virtual void SetVisible( bool visible ) { m_visible = visible; }
 
-  virtual bool GetVisible() { return m_visible; }
-  virtual void SetVisible( bool visible ) { m_visible = visible; }
+    bool IsNull() const { return (m_refData == 0); }
 
 protected:
-  bool m_visible; /* can a pointer to this object be safely taken?
-                   * - only if created within FindOrCreate... */
+    bool m_visible; /* can a pointer to this object be safely taken?
+                     * - only if created within FindOrCreate... */
+private:
+    DECLARE_DYNAMIC_CLASS(wxGDIObject)
 };
 
 #endif