rename round

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

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index b231df5bff132b39f6ae596b0771ebd517478302..fde6f06b6f97f0ed5cb42bc6d67c635d8a41648c 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -484,8 +484,8 @@ bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
      hFrame = ::WinCreateStdWindow( hParent
                                    ,ulStyleFlags          // frame-window style
                                    ,(PULONG)&lFlags       // window style
      hFrame = ::WinCreateStdWindow( hParent
                                    ,ulStyleFlags          // frame-window style
                                    ,(PULONG)&lFlags       // window style

-                                   ,wxFrameClassName // class name
-                                   ,rsTitle.c_str()  // window title
+                                   ,wxString(wxFrameClassName).c_str() // class name
+                                   ,rsTitle.c_str()       // window title

                                    ,0L                    // default client style
                                    ,NULLHANDLE            // resource in executable file
                                    ,0                     // resource id
                                    ,0L                    // default client style
                                    ,NULLHANDLE            // resource in executable file
                                    ,0                     // resource id


@@ -790,7 +790,7 @@ bool wxTopLevelWindowOS2::Show( bool bShow )
         ::WinEnableWindow(m_hFrame, TRUE);
 
         vEvent.SetEventObject(this);
         ::WinEnableWindow(m_hFrame, TRUE);
 
         vEvent.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(vEvent);
+        HandleWindowEvent(vEvent);

     }
     else
     {
     }
     else
     {


@@ -965,7 +965,7 @@ bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow,
 
         wxSize full( nWidth, nHeight );
         wxSizeEvent vEvent( full, GetId() );
 
         wxSize full( nWidth, nHeight );
         wxSizeEvent vEvent( full, GetId() );

-        GetEventHandler()->ProcessEvent(vEvent);
+        HandleWindowEvent(vEvent);

         return true;
     }
     else
         return true;
     }
     else


@@ -1004,9 +1004,9 @@ void wxTopLevelWindowOS2::SetIcons(
     //
     wxTopLevelWindowBase::SetIcons(rIcons);
 
     //
     wxTopLevelWindowBase::SetIcons(rIcons);
 

-    const wxIcon& vIcon = rIcons.GetIcon(32);
+    const wxIcon& vIcon = rIcons.GetIconOfExactSize(32);

 
 

-    if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32)
+    if (vIcon.Ok())

     {
         ::WinSendMsg( m_hFrame
                      ,WM_SETICON
     {
         ::WinSendMsg( m_hFrame
                      ,WM_SETICON