Fixed wxWindow::HandleCommand so multiple toolbars work again (e.g. ogl/studio sample);

added border to OGL studio window

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 0be7635f72d160a6d8a2f937432a670fab95f945..163a72e05531deda0fbde9059eea7e78469ed38c 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3020,13 +3020,14 @@ bool wxWindow::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
         return popupMenu->MSWCommand(cmd, id);
     }
 
         return popupMenu->MSWCommand(cmd, id);
     }
 

-    wxWindow *win;
+    wxWindow *win = (wxWindow*) NULL;

     if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
     {
         // must cast to a signed type before comparing with other ids!
         win = FindItem((signed short)id);
     }
     if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
     {
         // must cast to a signed type before comparing with other ids!
         win = FindItem((signed short)id);
     }

-    else
+
+    if (!win && control)

     {
         // find it from HWND - this works even with the broken programs using
         // the same ids for different controls
     {
         // find it from HWND - this works even with the broken programs using
         // the same ids for different controls

diff --git a/utils/ogl/samples/studio/studio.cpp b/utils/ogl/samples/studio/studio.cpp
index 01572c1e389200be15d5efc4c8dadde299d2508b..d8ca7a8890ec99e7f7472b0e4f8b3e56e1d1d606 100644 (file)
--- a/utils/ogl/samples/studio/studio.cpp
+++ b/utils/ogl/samples/studio/studio.cpp
@@ -285,7 +285,7 @@ csCanvas *csApp::CreateCanvas(wxView *view, wxFrame *parent)
   parent->GetClientSize(&width, &height);
 
   // Non-retained canvas
   parent->GetClientSize(&width, &height);
 
   // Non-retained canvas

-  csCanvas *canvas = new csCanvas((csDiagramView*) view, parent, 1000, wxPoint(0, 0), wxSize(width, height), 0);
+  csCanvas *canvas = new csCanvas((csDiagramView*) view, parent, 1000, wxPoint(0, 0), wxSize(width, height), wxSUNKEN_BORDER);

 
   wxColour bgColour("WHITE");
   canvas->SetBackgroundColour(bgColour);
 
   wxColour bgColour("WHITE");
   canvas->SetBackgroundColour(bgColour);

diff --git a/utils/wxMMedia2/lib/makefile.vc b/utils/wxMMedia2/lib/makefile.vc
index 458d3d076bc75f569fb6f05214556792d5c9d143..89301973589ecb5be010e206718d10d442e62d12 100644 (file)
--- a/utils/wxMMedia2/lib/makefile.vc
+++ b/utils/wxMMedia2/lib/makefile.vc
@@ -15,7 +15,7 @@
 WXDIR = $(WXWIN)
 MMDIR = $(WXDIR)\utils\wxMMedia2
 THISDIR = $(MMDIR)\lib
 WXDIR = $(WXWIN)
 MMDIR = $(WXDIR)\utils\wxMMedia2
 THISDIR = $(MMDIR)\lib

-EXTRALIBS=$(WXDIR)\lib\glcanvas.lib
+EXTRALIBS=$(WXDIR)\lib\mmedia2.lib

 
 LIBTARGET=$(WXDIR)\lib\mmedia2.lib
 OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj sndg72x.obj \
 
 LIBTARGET=$(WXDIR)\lib\mmedia2.lib
 OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj sndg72x.obj \