Upported combobox changes and another fix.

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

diff --git a/include/wx/gtk/gdiobj.h b/include/wx/gtk/gdiobj.h
index 2b6a5d1921378bd6550fd422decd02ca3a5e3fa8..12e15f3e0f0a5194949b01f2db487918a74e338f 100644 (file)
--- a/include/wx/gtk/gdiobj.h
+++ b/include/wx/gtk/gdiobj.h
@@ -2,9 +2,8 @@
 // Name:        gdiobj.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,23 +13,26 @@
 
 #include "wx/object.h"
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-class WXDLLEXPORT wxGDIObject: public wxObject
+class wxGDIObject : public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxGDIObject)
- public:
-  inline wxGDIObject(void) { m_visible = FALSE; };
-  inline ~wxGDIObject(void) {};
+public:
+    inline wxGDIObject() { m_visible = FALSE; };
+    inline ~wxGDIObject() {}
 
-  virtual bool GetVisible(void) { return m_visible; }
-  virtual void SetVisible(bool v) { m_visible = v; }
+    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