Fixed #1338966.

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

diff --git a/src/os2/accel.cpp b/src/os2/accel.cpp
index f87668f0626c057a6ac65085443c4044dd299100..34be76481503cfe9c93d0daf25e1c7500aaa367e 100644 (file)
--- a/src/os2/accel.cpp
+++ b/src/os2/accel.cpp
@@ -6,7 +6,7 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -135,20 +135,19 @@ wxAcceleratorTable::wxAcceleratorTable(
             uVirt |= AF_VIRTUALKEY;
         }
 
             uVirt |= AF_VIRTUALKEY;
         }
 

-        bool                        bIsVirtual;
-        USHORT                      uKey = wxCharCodeWXToOS2( vaEntries[i].GetKeyCode()
-                                                             ,&bIsVirtual
-                                                            );
+        bool bIsVirtual;
+        USHORT uKey = (USHORT)wxCharCodeWXToOS2( vaEntries[i].GetKeyCode(),
+                                                 &bIsVirtual);

         if (bIsVirtual)
             uVirt = AF_CHAR | AF_VIRTUALKEY;
 
         if (bIsVirtual)
             uVirt = AF_CHAR | AF_VIRTUALKEY;
 

-        USHORT                      uCmd = vaEntries[i].GetCommand();
+        USHORT uCmd = (USHORT)vaEntries[i].GetCommand();

 
         pArr->aaccel[i].fs  = uVirt;
         pArr->aaccel[i].key = uKey;
         pArr->aaccel[i].cmd = uCmd;
     }
 
         pArr->aaccel[i].fs  = uVirt;
         pArr->aaccel[i].key = uKey;
         pArr->aaccel[i].cmd = uCmd;
     }

-    pArr->codepage = ::WinQueryCp(wxTheApp->m_hMq);
+    pArr->codepage = (USHORT)::WinQueryCp(wxTheApp->m_hMq);

     pArr->cAccel = (USHORT)n;
     M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain
                                                   ,pArr
     pArr->cAccel = (USHORT)n;
     M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain
                                                   ,pArr


@@ -158,7 +157,7 @@ wxAcceleratorTable::wxAcceleratorTable(
         //
         // If we have accelerators the top window is the frame
         //
         //
         // If we have accelerators the top window is the frame
         //

-        wxFrame*                    pFrame = (wxFrame*)wxTheApp->GetTopWindow();
+        wxFrame* pFrame = (wxFrame*)wxTheApp->GetTopWindow();

 
         ::WinSetAccelTable( vHabmain
                            ,M_ACCELDATA->m_hAccel
 
         ::WinSetAccelTable( vHabmain
                            ,M_ACCELDATA->m_hAccel


@@ -203,10 +202,6 @@ bool wxAcceleratorTable::Translate(
                              ,GetHaccel()
                              ,pMsg
                             );
                              ,GetHaccel()
                              ,pMsg
                             );

-    if (rc)
-    {
-        int x = 1;
-    }

     return (Ok() && rc);
 } // end of wxAcceleratorTable::Translate
 
     return (Ok() && rc);
 } // end of wxAcceleratorTable::Translate
 


@@ -214,14 +209,12 @@ bool wxAcceleratorTable::Translate(
 // function for translating labels
 // ---------------------------------------------------------------------------
 
 // function for translating labels
 // ---------------------------------------------------------------------------
 

-wxString wxPMTextToLabel(
-  const wxString&                   rsTitle
-)
+wxString wxPMTextToLabel( const wxString& rsTitle )

 {
 {

-    wxString                        sTitle;
-    const wxChar*                   zPc;
+    wxString      sTitle;
+    const wxChar* zPc;

 
 

-    if (rsTitle.IsEmpty())
+    if (rsTitle.empty())

         return(sTitle);
 
     for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++)
         return(sTitle);
 
     for (zPc = rsTitle.c_str(); *zPc != wxT('\0'); zPc++)


@@ -251,4 +244,3 @@ wxString wxPMTextToLabel(
     }
     return(sTitle);
 } // end of wxPMTextToLabel
     }
     return(sTitle);
 } // end of wxPMTextToLabel

-