set more event object fields for lbox dbl click events

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index f03a8e20ed81d7216deff886e615adb23ace451f..70342ca40f4c85972ba76c9302b98f3e166c9c5b 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -183,7 +183,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
                             ,sizeof(ULONG)
                            ))
                             ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
                             ,sizeof(ULONG)
                            ))


@@ -196,7 +196,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassNameNoRedraw
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassNameNoRedraw

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,0
                             ,0
                            ))
                             ,0
                             ,0
                            ))


@@ -209,7 +209,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassName

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
                             ,0
                            ))
                             ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
                             ,0
                            ))


@@ -222,7 +222,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassNameNoRedraw
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIFrameClassNameNoRedraw

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,0
                             ,0
                            ))
                             ,0
                             ,0
                            ))


@@ -235,7 +235,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassName

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
                             ,0
                            ))
                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
                             ,0
                            ))


@@ -248,7 +248,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassNameNoRedraw
 
     if (!::WinRegisterClass( vHab
                             ,wxMDIChildFrameClassNameNoRedraw

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,CS_HITTEST
                             ,0
                            ))
                             ,CS_HITTEST
                             ,0
                            ))


@@ -261,7 +261,7 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxPanelClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxPanelClassName

-                            ,(PFNWP)wxWndProc
+                            ,NULL

                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
                             ,0
                            ))
                             ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
                             ,0
                            ))


@@ -274,8 +274,8 @@ bool wxApp::RegisterWindowClasses(
 
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
 
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName

-                            ,(PFNWP)wxWndProc
-                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
+                            ,NULL
+                            ,0 // CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT

                             ,0
                            ))
     {
                             ,0
                            ))
     {


@@ -651,9 +651,9 @@ int wxApp::MainLoop()
 #if wxUSE_THREADS
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 #if wxUSE_THREADS
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS

-        while (!Pending() && ProcessIdle())
+        while (/*Pending() &&*/ ProcessIdle())

         {
         {

-//            wxUsleep(10000);
+//          wxUsleep(10000);

         }
         DoMessage();
     }
         }
         DoMessage();
     }


@@ -747,13 +747,15 @@ bool wxApp::ProcessMessage(
        if(!(CHARMSG(pChmsg)->fs & KC_KEYUP))
        {
            if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0)
        if(!(CHARMSG(pChmsg)->fs & KC_KEYUP))
        {
            if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0)

-                CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)usch);
-
-            for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
-            {
-                if(pWnd->OS2TranslateMessage(pWxmsg))
-                    break;
-            }
+                CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch);
+
+  
+           for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
+           {
+               if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE)
+                   break;
+           }
+  

             if(!bRc)    // untranslated, should restore original value
                 CHARMSG(pChmsg)->chr = uSch;
         }
             if(!bRc)    // untranslated, should restore original value
                 CHARMSG(pChmsg)->chr = uSch;
         }


@@ -761,11 +763,11 @@ bool wxApp::ProcessMessage(
     //
     // Anyone for a non-translation message? Try youngest descendants first.
     //
     //
     // Anyone for a non-translation message? Try youngest descendants first.
     //

-    for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
-    {
-        if (pWnd->OS2ProcessMessage(pWxmsg))
-            return TRUE;
-    }
+//  for (pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent())
+//  {
+//      if (pWnd->OS2ProcessMessage(pWxmsg))
+//          return TRUE;
+//  }

     return FALSE;
 } // end of wxApp::ProcessMessage
 
     return FALSE;
 } // end of wxApp::ProcessMessage
 


@@ -778,7 +780,7 @@ void wxApp::OnIdle(
     //
     // Avoid recursion (via ProcessEvent default case)
     //
     //
     // Avoid recursion (via ProcessEvent default case)
     //

-    if (sbInOnIdle )
+    if (sbInOnIdle)

         return;
 
     sbInOnIdle = TRUE;
         return;
 
     sbInOnIdle = TRUE;