Save the last key event so EVT_CHAR events can filled in with extra

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

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index 40ebab45f216f910aa51ea6d907e6f796e8b8f43..af6dae09c1a10959ddb4d609fbc9ced18fdcd3aa 100644 (file)
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -25,16 +25,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1)
 
-wxBitmapButtonBase::wxBitmapButtonBase()
-                                      : m_bmpNormal(), 
-                                        m_bmpSelected(), 
-                                        m_bmpFocus(), 
-                                        m_bmpDisabled(), 
-                                        m_marginX(0), 
-                                        m_marginY(0)
-{
-}
-
 bool wxBitmapButton::Create(
   wxWindow*                         pParent
 , wxWindowID                        vId
@@ -87,7 +77,7 @@ bool wxBitmapButton::Create(
 
     m_hWnd = (WXHWND)::WinCreateWindow( GetHwndOf(pParent)
                                        ,WC_BUTTON
-                                       ,wxT("")
+                                       ,(PSZ)wxEmptyString
                                        ,ulOS2Style
                                        ,0, 0, 0, 0
                                        ,GetHwndOf(pParent)
@@ -121,7 +111,6 @@ bool wxBitmapButton::OS2OnDraw(
         return FALSE;
 
     wxBitmap*                       pBitmap;
-    RECTL                           vRect;
     bool                            bIsSelected = pUser->fsState & BDS_HILITED;
     wxClientDC                      vDc(this);
 
@@ -142,7 +131,6 @@ bool wxBitmapButton::OS2OnDraw(
     // Centre the bitmap in the control area
     //
     int                             nX         = 0;
-    int                             nY         = 0;
     int                             nX1        = 0;
     int                             nY1        = 0;
     int                             nWidth     = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;