Document wxTreeCtrl::GetItemFont() behaviour for items without font.

[wxWidgets.git] / src / os2 / control.cpp

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 2b425b0e447883ac3abd3476c115f88ec0407549..50020c88b555aa3a49dc6402e67daeb139f70540 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -22,6 +21,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/os2/dc.h"

 #include "wx/os2/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 #include "wx/os2/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)


@@ -59,11 +59,6 @@ bool wxControl::Create( wxWindow*           pParent,
     return bRval;
 } // end of wxControl::Create
 
     return bRval;
 } // end of wxControl::Create
 

-wxControl::~wxControl()
-{
-    m_isBeingDeleted = true;
-}
-

 bool wxControl::OS2CreateControl( const wxChar* zClassname,
                                   const wxString& rsLabel,
                                   const wxPoint& rPos,
 bool wxControl::OS2CreateControl( const wxChar* zClassname,
                                   const wxString& rsLabel,
                                   const wxPoint& rPos,


@@ -110,15 +105,15 @@ bool wxControl::OS2CreateControl( const wxChar*   zClassname,
     if (!pParent)
         return false;
 
     if (!pParent)
         return false;
 

-    if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0)
+    if ((wxStrcmp(zClassname, wxT("COMBOBOX"))) == 0)

         zClass = WC_COMBOBOX;
         zClass = WC_COMBOBOX;

-    else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0)
+    else if ((wxStrcmp(zClassname, wxT("STATIC"))) == 0)

         zClass = WC_STATIC;
         zClass = WC_STATIC;

-    else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0)
+    else if ((wxStrcmp(zClassname, wxT("BUTTON"))) == 0)

         zClass = WC_BUTTON;
         zClass = WC_BUTTON;

-    else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0)
+    else if ((wxStrcmp(zClassname, wxT("NOTEBOOK"))) == 0)

         zClass = WC_NOTEBOOK;
         zClass = WC_NOTEBOOK;

-    else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0)
+    else if ((wxStrcmp(zClassname, wxT("CONTAINER"))) == 0)

         zClass = WC_CONTAINER;
     if ((zClass == WC_STATIC) || (zClass == WC_BUTTON))
         dwStyle |= DT_MNEMONIC;
         zClass = WC_CONTAINER;
     if ((zClass == WC_STATIC) || (zClass == WC_BUTTON))
         dwStyle |= DT_MNEMONIC;


@@ -151,9 +146,7 @@ bool wxControl::OS2CreateControl( const wxChar*   zClassname,
 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {

-#ifdef __WXDEBUG__

         wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
         wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);

-#endif // DEBUG

 
         return false;
     }
 
         return false;
     }


@@ -215,7 +208,8 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
 void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
 {
     RECTL                           vRect;
 void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
 {
     RECTL                           vRect;

-    HPS                             hPS = rEvent.GetDC()->GetHPS();
+    wxPMDCImpl                     *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+    HPS                             hPS = impl->GetHPS();

     SIZEL                           vSize = {0,0};
 
     ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);
     SIZEL                           vSize = {0,0};
 
     ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);