Small changes after Robert's edits

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

diff --git a/include/wx/qt/gdiobj.h b/include/wx/qt/gdiobj.h
index 2b6a5d1921378bd6550fd422decd02ca3a5e3fa8..9263d4d6adaae1348825f7b975f88e931a71eda1 100644 (file)
--- a/include/wx/qt/gdiobj.h
+++ b/include/wx/qt/gdiobj.h
@@ -1,31 +1,42 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gdiobj.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gdiobj.h

-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Purpose:     wxGDIObject class: base class for other GDI classes
+// Author:      AUTHOR
+// Modified by:
+// Created:     ??/??/98
+// RCS-ID:      $Id$
+// Copyright:   (c) AUTHOR

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GDIOBJH__
-#define __GDIOBJH__
+#ifndef _WX_GDIOBJ_H_
+#define _WX_GDIOBJ_H_

 
 #include "wx/object.h"
 
 #ifdef __GNUG__
 
 #include "wx/object.h"
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "gdiobj.h"

 #endif
 
 #endif
 

+class WXDLLEXPORT wxGDIRefData: public wxObjectRefData {
+public:
+    inline wxGDIRefData()
+       {
+       }
+};
+
+#define M_GDIDATA ((wxGDIRefData *)m_refData)
+

 class WXDLLEXPORT wxGDIObject: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxGDIObject)
  public:
 class WXDLLEXPORT wxGDIObject: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxGDIObject)
  public:

-  inline wxGDIObject(void) { m_visible = FALSE; };
-  inline ~wxGDIObject(void) {};
+  inline wxGDIObject() { m_visible = FALSE; };
+  inline ~wxGDIObject() {};
+
+  inline bool IsNull() const { return (m_refData == 0); }

 
 

-  virtual bool GetVisible(void) { return m_visible; }
+  virtual bool GetVisible() { return m_visible; }

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


@@ -34,4 +45,4 @@ protected:
 };
 
 #endif
 };
 
 #endif

-    // __GDIOBJH__
+    // _WX_GDIOBJ_H_