Fix rawbitmap sample to clear bitmap first.

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 85f39c89caf162b6ab3eeaf1843cedea0832dd12..e7b33f782911d20c4aac7b6c049553264e365501 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/os2/frame.cpp

 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:


@@ -22,7 +22,6 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/event.h"

-    #include "wx/setup.h"

     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"


@@ -57,10 +56,6 @@ extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 
 extern wxMenu *wxCurrentPopupMenu;
 #endif
 

-extern void  wxAssociateWinWithHandle( HWND         hWnd
-                                      ,wxWindowOS2* pWin
-                                     );
-

 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------


@@ -242,13 +237,8 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
                         ,nHeight
                        );
 
                         ,nHeight
                        );
 

-    ::WinSetParent( pStatusBar->GetHWND()
-                   ,m_hFrame
-                   ,FALSE
-                  );
-    ::WinSetOwner( pStatusBar->GetHWND()
-                  ,m_hFrame
-                 );
+    ::WinSetParent( pStatusBar->GetHWND(), m_hFrame, FALSE );
+    ::WinSetOwner( pStatusBar->GetHWND(), m_hFrame);

     //
     // to show statusbar
     //
     //
     // to show statusbar
     //


@@ -302,7 +292,7 @@ void wxFrame::PositionStatusBar()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError(_T("Error setting parent for StautsBar. Error: %s\n"), sError.c_str());
+            wxLogError(_T("Error setting parent for StatusBar. Error: %s\n"), sError.c_str());

             return;
         }
     }
             return;
         }
     }


@@ -310,24 +300,15 @@ void wxFrame::PositionStatusBar()
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-wxToolBar* wxFrame::OnCreateToolBar(
-  long                              lStyle
-, wxWindowID                        vId
-, const wxString&                   rsName
-)
+wxToolBar* wxFrame::OnCreateToolBar( long lStyle, wxWindowID vId, const wxString& rsName )

 {
     wxToolBar*                      pToolBar = wxFrameBase::OnCreateToolBar( lStyle
                                                                             ,vId
                                                                             ,rsName
                                                                            );
 
 {
     wxToolBar*                      pToolBar = wxFrameBase::OnCreateToolBar( lStyle
                                                                             ,vId
                                                                             ,rsName
                                                                            );
 

-    ::WinSetParent( pToolBar->GetHWND()
-                   ,m_hFrame
-                   ,FALSE
-                  );
-    ::WinSetOwner( pToolBar->GetHWND()
-                  ,m_hFrame
-                 );
+    ::WinSetParent( pToolBar->GetHWND(), m_hFrame, FALSE);
+    ::WinSetOwner( pToolBar->GetHWND(), m_hFrame);

     return pToolBar;
 } // end of WinGuiBase_CFrame::OnCreateToolBar
 #endif
     return pToolBar;
 } // end of WinGuiBase_CFrame::OnCreateToolBar
 #endif


@@ -580,7 +561,7 @@ bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
         ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
         nWidth = vRect.xRight - vRect.xLeft;
         //
         ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
         nWidth = vRect.xRight - vRect.xLeft;
         //

-        // Rmember OS/2 is backwards!
+        // Remember OS/2 is backwards!

         //
         nHeight = vRect.yTop - vRect.yBottom;
 
         //
         nHeight = vRect.yTop - vRect.yBottom;
 


@@ -875,17 +856,12 @@ bool wxFrame::HandlePaint()
 
                 ::WinQueryWindowRect(GetHwnd(), &vRect3);
 
 
                 ::WinQueryWindowRect(GetHwnd(), &vRect3);
 

-#if !(defined(__WATCOMC__) && __WATCOMC__ < 1240 )
-// Open Watcom 1.3 had incomplete headers
-// that's reported and should be fixed for OW 1.4
-

                 static const int    nIconWidth = 32;
                 static const int    nIconHeight = 32;
                 int                 nIconX = (int)((vRect3.xRight - nIconWidth)/2);
                 int                 nIconY = (int)((vRect3.yBottom + nIconHeight)/2);
 
                 ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);
                 static const int    nIconWidth = 32;
                 static const int    nIconHeight = 32;
                 int                 nIconX = (int)((vRect3.xRight - nIconWidth)/2);
                 int                 nIconY = (int)((vRect3.yBottom + nIconHeight)/2);
 
                 ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);

-#endif

             }
             ::WinEndPaint(hPs);
         }
             }
             ::WinEndPaint(hPs);
         }