From 900ca9b89ac66740884f6d8d2b5b04ffca1bb3f7 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 20 Apr 2006 16:47:15 +0000 Subject: [PATCH] remove unneeded gdiobj.h files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/gdiobj.h | 44 ------------------------ include/wx/gtk/gdiobj.h | 34 ------------------ include/wx/gtk1/gdiobj.h | 34 ------------------ include/wx/mac/carbon/gdiobj.h | 45 ------------------------ include/wx/mac/classic/gdiobj.h | 44 ------------------------ include/wx/mac/gdiobj.h | 5 --- include/wx/mgl/gdiobj.h | 50 --------------------------- include/wx/motif/gdiobj.h | 44 ------------------------ include/wx/msw/gdiobj.h | 61 --------------------------------- include/wx/os2/gdiobj.h | 52 ---------------------------- include/wx/palmos/gdiobj.h | 61 --------------------------------- include/wx/x11/gdiobj.h | 44 ------------------------ 12 files changed, 518 deletions(-) delete mode 100644 include/wx/cocoa/gdiobj.h delete mode 100644 include/wx/gtk/gdiobj.h delete mode 100644 include/wx/gtk1/gdiobj.h delete mode 100644 include/wx/mac/carbon/gdiobj.h delete mode 100644 include/wx/mac/classic/gdiobj.h delete mode 100644 include/wx/mac/gdiobj.h delete mode 100644 include/wx/mgl/gdiobj.h delete mode 100644 include/wx/motif/gdiobj.h delete mode 100644 include/wx/msw/gdiobj.h delete mode 100644 include/wx/os2/gdiobj.h delete mode 100644 include/wx/palmos/gdiobj.h delete mode 100644 include/wx/x11/gdiobj.h diff --git a/include/wx/cocoa/gdiobj.h b/include/wx/cocoa/gdiobj.h deleted file mode 100644 index 29a9433da6..0000000000 --- a/include/wx/cocoa/gdiobj.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: David Elliott -// Modified by: -// Created: 2002/11/27 -// RCS-ID: -// Copyright: (c) AUTHOR -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" - -class WXDLLEXPORT wxGDIRefData: public wxObjectRefData { -public: - inline wxGDIRefData() - { - } -}; - -#define M_GDIDATA ((wxGDIRefData *)m_refData) - -class WXDLLEXPORT wxGDIObject: public wxObject -{ -DECLARE_DYNAMIC_CLASS(wxGDIObject) - public: - wxGDIObject() : m_visible(FALSE) { } - ~wxGDIObject() { } - - bool IsNull() const { return (m_refData == 0); } - - virtual bool GetVisible() { return m_visible; } - virtual void SetVisible(bool v) { m_visible = v; } - -protected: - bool m_visible; // Can a pointer to this object be safely taken? - // - only if created within FindOrCreate... -}; - -#endif - // _WX_GDIOBJ_H_ diff --git a/include/wx/gtk/gdiobj.h b/include/wx/gtk/gdiobj.h deleted file mode 100644 index ffc2b72c20..0000000000 --- a/include/wx/gtk/gdiobj.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: -// Author: Robert Roebling -// Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GDIOBJH__ -#define __GDIOBJH__ - -#include "wx/object.h" - -class WXDLLIMPEXP_CORE wxGDIObject : public wxObject -{ -public: - inline wxGDIObject() { m_visible = FALSE; }; - inline ~wxGDIObject() {} - - 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... */ -private: - DECLARE_DYNAMIC_CLASS(wxGDIObject) -}; - -#endif - // __GDIOBJH__ diff --git a/include/wx/gtk1/gdiobj.h b/include/wx/gtk1/gdiobj.h deleted file mode 100644 index 4a35500f3f..0000000000 --- a/include/wx/gtk1/gdiobj.h +++ /dev/null @@ -1,34 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/gdiobj.h -// Purpose: -// Author: Robert Roebling -// Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GDIOBJH__ -#define __GDIOBJH__ - -#include "wx/object.h" - -class WXDLLIMPEXP_CORE wxGDIObject : public wxObject -{ -public: - inline wxGDIObject() { m_visible = FALSE; }; - inline ~wxGDIObject() {} - - 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... */ -private: - DECLARE_DYNAMIC_CLASS(wxGDIObject) -}; - -#endif - // __GDIOBJH__ diff --git a/include/wx/mac/carbon/gdiobj.h b/include/wx/mac/carbon/gdiobj.h deleted file mode 100644 index 0fded012f7..0000000000 --- a/include/wx/mac/carbon/gdiobj.h +++ /dev/null @@ -1,45 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// RCS-ID: $Id$ -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" - -class WXDLLEXPORT wxGDIRefData: public wxObjectRefData { -public: - inline wxGDIRefData() - { - } -}; - -#define M_GDIDATA ((wxGDIRefData *)m_refData) - -class WXDLLEXPORT wxGDIObject: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxGDIObject) - -public: - wxGDIObject() : m_visible(false) { } - ~wxGDIObject() { } - - bool IsNull() const { return (m_refData == 0); } - - virtual bool GetVisible() { return m_visible; } - virtual void SetVisible(bool v) { m_visible = v; } - -protected: - bool m_visible; // Can a pointer to this object be safely taken? - // - only if created within FindOrCreate... -}; - -#endif - // _WX_GDIOBJ_H_ diff --git a/include/wx/mac/classic/gdiobj.h b/include/wx/mac/classic/gdiobj.h deleted file mode 100644 index 0254ac998b..0000000000 --- a/include/wx/mac/classic/gdiobj.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// RCS-ID: $Id$ -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" - -class WXDLLEXPORT wxGDIRefData: public wxObjectRefData { -public: - inline wxGDIRefData() - { - } -}; - -#define M_GDIDATA ((wxGDIRefData *)m_refData) - -class WXDLLEXPORT wxGDIObject: public wxObject -{ -DECLARE_DYNAMIC_CLASS(wxGDIObject) - public: - wxGDIObject() : m_visible(FALSE) { } - ~wxGDIObject() { } - - bool IsNull() const { return (m_refData == 0); } - - virtual bool GetVisible() { return m_visible; } - virtual void SetVisible(bool v) { m_visible = v; } - -protected: - bool m_visible; // Can a pointer to this object be safely taken? - // - only if created within FindOrCreate... -}; - -#endif - // _WX_GDIOBJ_H_ diff --git a/include/wx/mac/gdiobj.h b/include/wx/mac/gdiobj.h deleted file mode 100644 index da59287474..0000000000 --- a/include/wx/mac/gdiobj.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef __WXMAC_CLASSIC__ -#include "wx/mac/classic/gdiobj.h" -#else -#include "wx/mac/carbon/gdiobj.h" -#endif diff --git a/include/wx/mgl/gdiobj.h b/include/wx/mgl/gdiobj.h deleted file mode 100644 index 7e44a68909..0000000000 --- a/include/wx/mgl/gdiobj.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/mgl/gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" // base class - -// ---------------------------------------------------------------------------- -// wxGDIRefData is the base class for wxXXXData structures which contain the -// real data for the GDI object and are shared among all wxWin objects sharing -// the same native GDI object -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGDIRefData : public wxObjectRefData -{ - // this class is intentionally left blank -}; - -// ---------------------------------------------------------------------------- -// wxGDIObject -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGDIObject : public wxObject -{ -public: - wxGDIObject() { m_visible = false; } - - 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... */ - -private: - DECLARE_DYNAMIC_CLASS(wxGDIObject) -}; - -#endif // _WX_GDIOBJ_H_ diff --git a/include/wx/motif/gdiobj.h b/include/wx/motif/gdiobj.h deleted file mode 100644 index 97ea125b11..0000000000 --- a/include/wx/motif/gdiobj.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" - -class WXDLLEXPORT wxGDIRefData: public wxObjectRefData { -public: - inline wxGDIRefData() - { - } -}; - -#define M_GDIDATA ((wxGDIRefData *)m_refData) - -class WXDLLEXPORT wxGDIObject: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxGDIObject) -public: - inline wxGDIObject() { m_visible = false; }; - inline ~wxGDIObject() {}; - - inline bool IsNull() const { return (m_refData == 0); } - - virtual bool GetVisible() { return m_visible; } - virtual void SetVisible(bool v) { m_visible = v; } - -protected: - bool m_visible; // Can a pointer to this object be safely taken? - // - only if created within FindOrCreate... -}; - -#endif -// _WX_GDIOBJ_H_ diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h deleted file mode 100644 index 4be2edb8be..0000000000 --- a/include/wx/msw/gdiobj.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" // base class - -// ---------------------------------------------------------------------------- -// wxGDIRefData is the base class for wxXXXData structures which contain the -// real data for the GDI object and are shared among all wxWin objects sharing -// the same native GDI object -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGDIRefData : public wxObjectRefData -{ - // this class is intentionally left blank -}; - -// ---------------------------------------------------------------------------- -// wxGDIObject -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGDIObject : public wxObject -{ -public: - wxGDIObject() { m_visible = false; }; - - // Creates the resource - virtual bool RealizeResource() { return false; }; - - // Frees the resource - virtual bool FreeResource(bool WXUNUSED(force) = false) { return false; } - - virtual bool IsFree() const { return false; } - - bool IsNull() const { return (m_refData == 0); } - - // Returns handle. - virtual WXHANDLE GetResourceHandle() const { return 0; } - - 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 - -private: - DECLARE_DYNAMIC_CLASS(wxGDIObject) -}; - -#endif - // _WX_GDIOBJ_H_ diff --git a/include/wx/os2/gdiobj.h b/include/wx/os2/gdiobj.h deleted file mode 100644 index 8df2166d6a..0000000000 --- a/include/wx/os2/gdiobj.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: David Webster -// Modified by: -// Created: ??/??/98 -// RCS-ID: $Id$ -// Copyright: (c) David Webster -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" - -class WXDLLEXPORT wxGDIRefData: public wxObjectRefData -{ -public: - inline wxGDIRefData() - { } -}; - -#define M_GDIDATA ((wxGDIRefData *)m_refData) - -class WXDLLEXPORT wxGDIObject: public wxObject -{ -DECLARE_DYNAMIC_CLASS(wxGDIObject) - public: - inline wxGDIObject() { m_visible = FALSE; }; - inline ~wxGDIObject() {}; - - // Creates the resource - virtual bool RealizeResource(void) { return FALSE; }; - - // Frees the resource - virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; }; - - virtual bool IsFree(void) const { return FALSE; }; - - inline bool IsNull() const { return (m_refData == 0); } - - virtual bool GetVisible() { return m_visible; } - virtual void SetVisible(bool v) { m_visible = v; } - -protected: - bool m_visible; // Can a pointer to this object be safely taken? - // - only if created within FindOrCreate... -}; - -#endif - // _WX_GDIOBJ_H_ diff --git a/include/wx/palmos/gdiobj.h b/include/wx/palmos/gdiobj.h deleted file mode 100644 index dcdfc31d28..0000000000 --- a/include/wx/palmos/gdiobj.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/palmos/gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: William Osborne - minimal working wxPalmOS port -// Modified by: -// Created: 10/13/04 -// RCS-ID: $Id$ -// Copyright: (c) William Osborne -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" // base class - -// ---------------------------------------------------------------------------- -// wxGDIRefData is the base class for wxXXXData structures which contain the -// real data for the GDI object and are shared among all wxWin objects sharing -// the same native GDI object -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGDIRefData : public wxObjectRefData -{ - // this class is intentionally left blank -}; - -// ---------------------------------------------------------------------------- -// wxGDIObject -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxGDIObject : public wxObject -{ -public: - wxGDIObject() { m_visible = FALSE; }; - - // Creates the resource - virtual bool RealizeResource() { return FALSE; }; - - // Frees the resource - virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; } - - virtual bool IsFree() const { return FALSE; } - - bool IsNull() const { return (m_refData == 0); } - - // Returns handle. - virtual WXHANDLE GetResourceHandle() const { return 0; } - - 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 - -private: - DECLARE_DYNAMIC_CLASS(wxGDIObject) -}; - -#endif - // _WX_GDIOBJ_H_ diff --git a/include/wx/x11/gdiobj.h b/include/wx/x11/gdiobj.h deleted file mode 100644 index 5b018e50e5..0000000000 --- a/include/wx/x11/gdiobj.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: gdiobj.h -// Purpose: wxGDIObject class: base class for other GDI classes -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GDIOBJ_H_ -#define _WX_GDIOBJ_H_ - -#include "wx/object.h" - -class WXDLLEXPORT wxGDIRefData: public wxObjectRefData { -public: - inline wxGDIRefData() - { - } -}; - -#define M_GDIDATA ((wxGDIRefData *)m_refData) - -class WXDLLEXPORT wxGDIObject: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxGDIObject) -public: - inline wxGDIObject() { m_visible = FALSE; }; - inline ~wxGDIObject() {}; - - inline bool IsNull() const { return (m_refData == 0); } - - virtual bool GetVisible() { return m_visible; } - virtual void SetVisible(bool v) { m_visible = v; } - -protected: - bool m_visible; // Can a pointer to this object be safely taken? - // - only if created within FindOrCreate... -}; - -#endif -// _WX_GDIOBJ_H_