Accelerators now work for wxDialog; wxToolBarSimple fixed when dragging out of

the toolbar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/tbarsmpl.cpp

@@ -39,12 +39,6 @@ BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
 END_EVENT_TABLE()
 #endif
 
-// TODO: eliminate these; use system colours
-static wxPen * white_pen = NULL,
-             * dark_grey_pen = NULL,
-             * black_pen = NULL,
-             * thick_black_pen;
-
 wxToolBarSimple::wxToolBarSimple(void)
 {
     m_currentRowsOrColumns = 0;
@@ -63,25 +57,6 @@ bool wxToolBarSimple::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos
   SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_3DFACE));
   SetDefaultBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_3DFACE));
 
-  if ( white_pen == 0 )
-  {
-    white_pen = new wxPen;
-    white_pen->SetColour( "WHITE" );
-  }
-  if ( dark_grey_pen == 0 )
-  {
-    dark_grey_pen = new wxPen;
-    dark_grey_pen->SetColour( 85,85,85 );
-  }
-  if ( black_pen == 0 )
-  {
-    black_pen = new wxPen;
-    black_pen->SetColour( "BLACK" );
-  }
-  if ( thick_black_pen == 0 )
-  {
-    thick_black_pen = new wxPen("BLACK", 3, wxSOLID);
-  }
   if ( GetWindowStyleFlag() & wxTB_VERTICAL )
     { m_lastX = 7; m_lastY = 3; }
   else
@@ -139,6 +114,15 @@ void wxToolBarSimple::OnMouseEvent ( wxMouseEvent & event )
     event.Position(&x, &y);
     wxToolBarTool *tool = FindToolForPosition(x, y);
 
+    if (event.LeftDown())
+    {
+        CaptureMouse();
+    }
+    if (event.LeftUp())
+    {
+        ReleaseMouse();
+    }
+
     if (!tool)
       {
 	  if (m_currentTool > -1)
@@ -157,16 +141,17 @@ void wxToolBarSimple::OnMouseEvent ( wxMouseEvent & event )
 	    {
 		// If the left button is kept down and moved over buttons,
 		// press those buttons.
-		if (event.LeftIsDown() && tool->m_enabled) {
+		if (event.LeftIsDown() && tool->m_enabled)
-		    SpringUpButton(m_currentTool);
+        {
-		    tool->m_toggleState = !tool->m_toggleState;
+            SpringUpButton(m_currentTool);
-		    wxMemoryDC *dc2 = new wxMemoryDC;
+            tool->m_toggleState = !tool->m_toggleState;
-			wxClientDC dc(this);
+            wxMemoryDC *dc2 = new wxMemoryDC;
-		    DrawTool(dc, *dc2, tool);
+            wxClientDC dc(this);
-		    delete dc2;
+            DrawTool(dc, *dc2, tool);
+            delete dc2;
 		}
-		OnMouseEnter(tool->m_index);
+        m_currentTool = tool->m_index;
-		m_currentTool = tool->m_index;
+        OnMouseEnter(tool->m_index);
 	    }
 	  return;
       }
@@ -174,33 +159,44 @@ void wxToolBarSimple::OnMouseEvent ( wxMouseEvent & event )
   // Left button pressed.
   if (event.LeftDown() && tool->m_enabled)
   {
-      tool->m_toggleState = !tool->m_toggleState;
+      if (tool->m_isToggle)
+      {
+        tool->m_toggleState = !tool->m_toggleState;
+      }
+
       wxMemoryDC *dc2 = new wxMemoryDC;
 	  wxClientDC dc(this);
       DrawTool(dc, *dc2, tool);
       delete dc2;
+
   }
   else if (event.RightDown())
   {
     OnRightClick(tool->m_index, x, y);
   }
+
   // Left Button Released.  Only this action confirms selection.
   // If the button is enabled and it is not a toggle tool and it is
   // in the pressed state, then raise the button and call OnLeftClick.
   //
   if (event.LeftUp() && tool->m_enabled &&
-      (tool->m_toggleState || tool->m_isToggle)){
+      (tool->m_toggleState || tool->m_isToggle))
-      if (!tool->m_isToggle)
+  {
-	tool->m_toggleState = FALSE;
+    if (!tool->m_isToggle)
-      // Pass the OnLeftClick event to tool
+        tool->m_toggleState = FALSE;
-      if (!OnLeftClick(tool->m_index, tool->m_toggleState) && tool->m_isToggle)
+
-	// If it was a toggle, and OnLeftClick says No Toggle allowed,
+    // Pass the OnLeftClick event to tool
-	// then change it back
+    if (!OnLeftClick(tool->m_index, tool->m_toggleState) && tool->m_isToggle)
-	tool->m_toggleState = !tool->m_toggleState;
+    {
+        // If it was a toggle, and OnLeftClick says No Toggle allowed,
+        // then change it back
+        tool->m_toggleState = !tool->m_toggleState;
+    }
+
     wxClientDC dc(this);
-      wxMemoryDC *dc2 = new wxMemoryDC;
+    wxMemoryDC *dc2 = new wxMemoryDC;
-      DrawTool(dc, *dc2, tool);
+    DrawTool(dc, *dc2, tool);
-      delete dc2;
+    delete dc2;
   }
 }
 
@@ -208,6 +204,10 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 {
   PrepareDC(dc);
 
+  wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
+  wxPen white_pen("WHITE", 1, wxSOLID);
+  wxPen black_pen("BLACK", 1, wxSOLID);
+
   wxBitmap *bitmap = tool->m_toggleState ? (& tool->m_bitmap2) : (& tool->m_bitmap1);
 
   if (bitmap && bitmap->Ok())
@@ -226,13 +226,13 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
       dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
       dc.Blit((ax+1), (ay+1), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
       wxPen * old_pen = dc.GetPen();
-      dc.SetPen( *white_pen );
+      dc.SetPen( white_pen );
       dc.DrawLine(ax,(by-1),ax,ay);
       dc.DrawLine(ax,ay,(bx-1),ay);
-      dc.SetPen( *dark_grey_pen );
+      dc.SetPen( dark_grey_pen );
       dc.DrawLine((bx-1),(ay+1),(bx-1),(by-1));
       dc.DrawLine((bx-1),(by-1),(ax+1),(by-1));
-      dc.SetPen( *black_pen );
+      dc.SetPen( black_pen );
       dc.DrawLine(bx,ay,bx,by);
       dc.DrawLine(bx,by,ax,by);
       dc.SetPen( *old_pen );
@@ -278,13 +278,13 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
         dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
         dc.Blit((ax+2), (ay+2), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
         wxPen * old_pen = dc.GetPen();
-        dc.SetPen( *black_pen );
+        dc.SetPen( black_pen );
         dc.DrawLine(ax,(by-1),ax,ay);
         dc.DrawLine(ax,ay,(bx-1),ay);
-        dc.SetPen( *dark_grey_pen );
+        dc.SetPen( dark_grey_pen );
         dc.DrawLine((ax+1),(by-2),(ax+1),(ay+1));
         dc.DrawLine((ax+1),(ay+1),(bx-2),(ay+1));
-        dc.SetPen( *white_pen );
+        dc.SetPen( white_pen );
         dc.DrawLine(bx,ay,bx,by);
         dc.DrawLine(bx,by,ax,by);
         dc.SetPen( *old_pen );
@@ -297,12 +297,13 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
         long y = tool->m_y;
         long w = tool->m_bitmap1.GetWidth();
         long h = tool->m_bitmap1.GetHeight();
+        wxPen thick_black_pen("BLACK", 3, wxSOLID);
 
         memDC.SelectObject(tool->m_bitmap1);
         dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);
         dc.Blit(tool->m_x, tool->m_y, w, h,
                  &memDC, 0, 0);
-        dc.SetPen(*thick_black_pen);
+        dc.SetPen(thick_black_pen);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
         dc.DrawRectangle(x, y, w-1, h-1);
         dc.DestroyClippingRegion();

src/msw/button.cpp

@@ -36,7 +36,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
 bool wxButton::MSWCommand(WXUINT param, WXWORD id)
 {
-  if (param == BN_CLICKED)
+  if (param == BN_CLICKED || (param == 1)) // 1 for accelerator
   {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, id);
     event.SetEventObject(this);

src/msw/dialog.cpp

@@ -351,7 +351,12 @@ bool wxDialog::Show(bool show)
       // a message before the deletion.
       while (wxModalDialogs.Member(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0))
       {
-        if (!IsDialogMessage((HWND) GetHWND(), &msg))
+        if (m_acceleratorTable.Ok() &&
+          ::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), &msg))
+        {
+            // Have processed the message
+        }
+        else if (!IsDialogMessage((HWND) GetHWND(), &msg))
         {
           TranslateMessage(&msg);
           DispatchMessage(&msg);

src/msw/window.cpp

@@ -4381,7 +4381,18 @@ void wxWindow::OnIdle(wxIdleEvent& event)
         {
             // Generate a LEAVE event
             m_mouseInWindow = FALSE;
-            MSWOnMouseLeave(pt.x, pt.y, 0);
+
+            int state;
+            if (::GetKeyState(VK_SHIFT) != 0)
+                state |= MK_SHIFT;
+            if (::GetKeyState(VK_CONTROL) != 0)
+                state |= MK_CONTROL;
+
+            // Unfortunately the mouse button and keyboard state may have changed
+            // by the time the OnIdle function is called, so 'state' may be
+            // meaningless.
+
+            MSWOnMouseLeave(pt.x, pt.y, state);
         }
     }
     UpdateWindowUI();