Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
added border to OGL studio window


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-25 16:20:58 +00:00
parent e006f096ad
commit 2f4ef631af
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/msw/window.cpp
View File

@@ -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 if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
{ {
// must cast to a signed type before comparing with other ids! // must cast to a signed type before comparing with other ids!
win = FindItem((signed short)id); win = FindItem((signed short)id);
} }
else
if (!win && control)
{ {
// find it from HWND - this works even with the broken programs using // find it from HWND - this works even with the broken programs using
// the same ids for different controls // the same ids for different controls

2
utils/ogl/samples/studio/studio.cpp
View File

@@ -285,7 +285,7 @@ csCanvas *csApp::CreateCanvas(wxView *view, wxFrame *parent)
parent->GetClientSize(&width, &height); parent->GetClientSize(&width, &height);
// Non-retained canvas // 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"); wxColour bgColour("WHITE");
canvas->SetBackgroundColour(bgColour); canvas->SetBackgroundColour(bgColour);

2
utils/wxMMedia2/lib/makefile.vc
View File

@@ -15,7 +15,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
MMDIR = $(WXDIR)\utils\wxMMedia2 MMDIR = $(WXDIR)\utils\wxMMedia2
THISDIR = $(MMDIR)\lib THISDIR = $(MMDIR)\lib
EXTRALIBS=$(WXDIR)\lib\glcanvas.lib EXTRALIBS=$(WXDIR)\lib\mmedia2.lib
LIBTARGET=$(WXDIR)\lib\mmedia2.lib LIBTARGET=$(WXDIR)\lib\mmedia2.lib
OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj sndg72x.obj \ OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj sndg72x.obj \