Correct 'markup' for GetResourceHandle after recent change in wx/gdiobj.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h
index f1d7be63e680a4a231d427c53d35789ca9ed7ce5..c7657279d543d5cceab9e95f4c4a3a163cdbc3af 100644 (file)
--- a/include/wx/os2/brush.h
+++ b/include/wx/os2/brush.h
@@ -72,7 +72,7 @@ public:
     // Useful helper: create the brush resource
     //
     bool     RealizeResource(void);
     // Useful helper: create the brush resource
     //
     bool     RealizeResource(void);

-    WXHANDLE GetResourceHandle(void) ;
+    virtual WXHANDLE GetResourceHandle(void) const;

     bool     FreeResource(bool bForce = false);
     bool     IsFree(void) const;
     void     Unshare(void);
     bool     FreeResource(bool bForce = false);
     bool     IsFree(void) const;
     void     Unshare(void);

diff --git a/include/wx/os2/font.h b/include/wx/os2/font.h
index 08e7ade7e3082f4027fdc16286ea6bb742f9d8ec..92e0b22698ddc88578ecafb6cc2407ad5d7435b7 100644 (file)
--- a/include/wx/os2/font.h
+++ b/include/wx/os2/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        font.h
+// Name:        wx/os2/font.h

 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFont class
 // Author:      David Webster
 // Modified by:


@@ -105,7 +105,7 @@ public:
     //
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);
     //
     virtual bool     IsFree(void) const;
     virtual bool     RealizeResource(void);

-    virtual WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;

     virtual bool     FreeResource(bool bForce = false);
 
     WXHFONT GetHFONT(void) const;
     virtual bool     FreeResource(bool bForce = false);
 
     WXHFONT GetHFONT(void) const;

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index 34c4c73d0d56be9485740ad69e35e0c86f7b99d7..4b645fe9da259bb96b46ecc8ee6a2a7655244e9c 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/os2/gdiimage.h
+// Name:        wx/os2/gdiimage.h

 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under OS/2
 // Author:      David Webster (adapted from msw version by Vadim Zeitlin)
 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under OS/2
 // Author:      David Webster (adapted from msw version by Vadim Zeitlin)


@@ -44,8 +44,8 @@ public:
     bool IsOk() const
     {
         if (m_hHandle == 0)
     bool IsOk() const
     {
         if (m_hHandle == 0)

-            return FALSE;
-        return TRUE;
+            return false;
+        return true;

     }
 
     void SetSize( int nW
     }
 
     void SetSize( int nW


@@ -226,8 +226,8 @@ public:
         pData->m_uId = uId;
     }
     // forward some of base class virtuals to wxGDIImageRefData
         pData->m_uId = uId;
     }
     // forward some of base class virtuals to wxGDIImageRefData

-    bool             FreeResource(bool bForce = FALSE);
-    virtual WXHANDLE GetResourceHandle();
+    bool             FreeResource(bool bForce = false);
+    virtual WXHANDLE GetResourceHandle() const;

 
 protected:
     // create the data for the derived class here
 
 protected:
     // create the data for the derived class here

diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h
index 17c6822ac099c3fcfc0e3a8ef4a2851b5851b5ad..233016dc124002e5c2b2f340cdee65d3692ca48f 100644 (file)
--- a/include/wx/os2/pen.h
+++ b/include/wx/os2/pen.h
@@ -105,7 +105,7 @@ public:
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);
     //
     bool     RealizeResource(void);
     bool     FreeResource(bool bForce = false);

-    WXHANDLE GetResourceHandle(void);
+    virtual WXHANDLE GetResourceHandle(void) const;

     bool     IsFree(void) const;
     void     Unshare(void);
 
     bool     IsFree(void) const;
     void     Unshare(void);
 

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index 8e4682fff7330427599bf702508d542b9d9443c1..1c9f7c84d551606694d78a241035c0321dee4c65 100644 (file)
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -212,7 +212,7 @@ bool wxBrush::RealizeResource()
     return false;
 } // end of wxBrush::RealizeResource
 
     return false;
 } // end of wxBrush::RealizeResource
 

-WXHANDLE wxBrush::GetResourceHandle()
+WXHANDLE wxBrush::GetResourceHandle() const

 {
     if (!M_BRUSHDATA)
         return 0;
 {
     if (!M_BRUSHDATA)
         return 0;

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index a85ff9d642b04c1a7810600991f9c02f23a11eaa..0742d230705f289edec4b54bcb21e23df3557047 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -51,7 +51,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
 public:
     wxFontRefData()
     {

-        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
+        Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false,

              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 
              wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 


@@ -948,7 +948,7 @@ bool wxFont::FreeResource( bool WXUNUSED(bForce) )
     return false;
 } // end of wxFont::FreeResource
 
     return false;
 } // end of wxFont::FreeResource
 

-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetResourceHandle() const

 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle
 {
     return GetHFONT();
 } // end of wxFont::GetResourceHandle

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index a5b6a56e7a7e1001e2435b302cec45937d431ce8..0d21c81be07966255c235c9ee2e20b5dcf27fe97 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -241,7 +241,7 @@ bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) )
     return true;
 }
 
     return true;
 }
 

-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle() const

 {
     return GetHandle();
 }
 {
     return GetHandle();
 }

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index 407924864227667184754b9eb33bacb3064d43e4..24d89e39b2a1397e725dee7130e09f71d7f27f1a 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -304,7 +304,7 @@ bool wxPen::RealizeResource()
     return false;
 } // end of wxPen::RealizeResource
 
     return false;
 } // end of wxPen::RealizeResource
 

-WXHANDLE wxPen::GetResourceHandle()
+WXHANDLE wxPen::GetResourceHandle() const

 {
     if (!M_PENDATA)
         return 0;
 {
     if (!M_PENDATA)
         return 0;