1. wxChoice and wxComboBox support client data under MSW

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

diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h
index 31c3f4ad978ccfa0c0114a585d0ed050133a7352..8f79cd0133cbdf19deaee21972f3dc538969413c 100644 (file)
--- a/include/wx/msw/gdiobj.h
+++ b/include/wx/msw/gdiobj.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GDIOBJH__
-#define __GDIOBJH__
+#ifndef _WX_GDIOBJ_H_
+#define _WX_GDIOBJ_H_
 
 #include "wx/object.h"
 
@@ -48,7 +48,7 @@ DECLARE_DYNAMIC_CLASS(wxGDIObject)
   // Frees the resource
   virtual bool FreeResource(bool WXUNUSED(force) = FALSE) { return FALSE; };
 
-  virtual bool IsFree(void) { return FALSE; };
+  virtual bool IsFree(void) const { return FALSE; };
 
   inline bool IsNull(void) const { return (m_refData == 0); }
 
@@ -64,4 +64,4 @@ protected:
 };
 
 #endif
-    // __GDIOBJH__
+    // _WX_GDIOBJ_H_