OS/2 VisualAge doesn't know about lower case true and false and redefine a for loop...

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index edc8f919d2e498b1429dbfa1bd25c66e94b0ab20..4c0870f57707e00e505a16c977306d67dc44f872 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -55,7 +55,9 @@ extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxChar wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 
 extern wxChar wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 

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

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


@@ -630,7 +632,7 @@ void wxFrame::InternalSetMenuBar()
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }

-    WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+    ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

 } // end of wxFrame::InternalSetMenuBar
 
 //
 } // end of wxFrame::InternalSetMenuBar
 
 //


@@ -706,9 +708,9 @@ bool wxFrame::ShowFullScreen(
 
         if (lStyle & wxFULLSCREEN_NOMENUBAR)
         {
 
         if (lStyle & wxFULLSCREEN_NOMENUBAR)
         {

-            ::WinSetParent(m_hMenu, GetHWND(), FALSE);
-            ::WinSetOwner(m_hMenu, GetHWND());
-            ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+            ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+            ::WinSetOwner(m_hMenu, m_hFrame);
+            ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

         }
 
 #if wxUSE_STATUSBAR
         }
 
 #if wxUSE_STATUSBAR


@@ -732,16 +734,16 @@ bool wxFrame::ShowFullScreen(
         //
         // Save the 'normal' window style
         //
         //
         // Save the 'normal' window style
         //

-        m_lFsOldWindowStyle = ::WinQueryWindowULong((HWND)GetHWND(), QWL_STYLE);
+        m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE);

 
         //
 
         //

-           // Save the old position, width & height, maximize state
+        // Save the old position, width & height, maximize state

         //
         m_vFsOldSize = GetRect();
         m_bFsIsMaximized = IsMaximized();
 
         //
         //
         m_vFsOldSize = GetRect();
         m_bFsIsMaximized = IsMaximized();
 
         //

-            // Decide which window style flags to turn off
+        // Decide which window style flags to turn off

         //
         LONG                        lNewStyle = m_lFsOldWindowStyle;
         LONG                        lOffFlags = 0;
         //
         LONG                        lNewStyle = m_lFsOldWindowStyle;
         LONG                        lOffFlags = 0;


@@ -756,7 +758,7 @@ bool wxFrame::ShowFullScreen(
         //
         // Change our window style to be compatible with full-screen mode
         //
         //
         // Change our window style to be compatible with full-screen mode
         //

-        ::WinSetWindowULong((HWND)GetHWND(), QWL_STYLE, (ULONG)lNewStyle);
+        ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle);

 
         //
         // Resize to the size of the desktop
 
         //
         // Resize to the size of the desktop


@@ -827,13 +829,13 @@ bool wxFrame::ShowFullScreen(
 
         if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
         {
 
         if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
         {

-            ::WinSetParent(m_hMenu, GetHWND(), FALSE);
-            ::WinSetOwner(m_hMenu, GetHWND());
-            ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+            ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+            ::WinSetOwner(m_hMenu, m_hFrame);
+            ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

         }
         Maximize(m_bFsIsMaximized);
 
         }
         Maximize(m_bFsIsMaximized);
 

-        ::WinSetWindowULong( (HWND)GetHWND()
+        ::WinSetWindowULong( m_hFrame

                             ,QWL_STYLE
                             ,(ULONG)m_lFsOldWindowStyle
                            );
                             ,QWL_STYLE
                             ,(ULONG)m_lFsOldWindowStyle
                            );


@@ -1253,7 +1255,7 @@ bool wxFrame::HandlePaint()
             HPOINTER                hIcon;
 
             if (m_icon.Ok())
             HPOINTER                hIcon;
 
             if (m_icon.Ok())

-                hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
+                hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);

             else
                 hIcon = (HPOINTER)m_hDefaultIcon;
 
             else
                 hIcon = (HPOINTER)m_hDefaultIcon;
 


@@ -1599,12 +1601,15 @@ MRESULT wxFrame::OS2WindowProc(
             {
                 HPS                             hPS;
                 RECTL                           vRect;
             {
                 HPS                             hPS;
                 RECTL                           vRect;

+                wxPaintEvent                    vEvent;

 
                 hPS = WinBeginPaint(m_hWnd, 0L, &vRect);
                 ::WinFillRect(hPS, &vRect,  CLR_BLUE  /* SYSCLR_WINDOW */);
                 ::WinEndPaint(hPS);
 
                 mRc = (MRESULT)FALSE;
 
                 hPS = WinBeginPaint(m_hWnd, 0L, &vRect);
                 ::WinFillRect(hPS, &vRect,  CLR_BLUE  /* SYSCLR_WINDOW */);
                 ::WinEndPaint(hPS);
 
                 mRc = (MRESULT)FALSE;

+                vEvent.SetEventObject(this);
+                GetEventHandler()->ProcessEvent(vEvent);

                 bProcessed = TRUE;
             }
             break;
                 bProcessed = TRUE;
             }
             break;


@@ -1721,7 +1726,7 @@ void wxFrame::SetClient(
         pOldClient->Show( FALSE );
         ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
         // to avoid OS/2 bug need to update frame
         pOldClient->Show( FALSE );
         ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
         // to avoid OS/2 bug need to update frame

-        ::WinSendMsg((HWND)this->GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+        ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);

         return;
     }
 
         return;
     }
 


@@ -1746,11 +1751,11 @@ void wxFrame::SetClient(
     if( this->IsShown() )
     {
         this->Show();
     if( this->IsShown() )
     {
         this->Show();

-        ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);

     }
 }
 
 wxWindow* wxFrame::GetClient()
 {
     }
 }
 
 wxWindow* wxFrame::GetClient()
 {

-    return wxFindWinFromHandle((WXHWND)::WinWindowFromID(GetHWND(), FID_CLIENT));
+    return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));

 }
 }