speeding up rectangle drawing by using specific methods, needs 40% less time

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

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 0c53e236b9234cd18be7164ea879812b14db11b8..4b4ecbb55c764e2cc431a6c6164bdca29c2557ad 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -60,11 +60,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,


@@ -111,15 +106,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;


@@ -152,9 +147,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;
     }