Fixed OnMenuHighlight, wxPrintData problems

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

src/common/cmndata.cpp

@@ -198,6 +198,10 @@ wxPrintData::wxPrintData()
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
+#ifdef __WXMSW__
+    m_devMode = NULL;
+#endif
+
     (*this) = printData;
 }
 

src/makevc.env

@@ -131,7 +131,7 @@ D=$(D)DLL
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)
 LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
 
 MAKEPRECOMP=/YcWX/WXPREC.H

src/msw/frame.cpp

@@ -761,7 +761,7 @@ void wxFrame::MSWOnMenuHighlight(WXWORD nItem, WXWORD nFlags, WXHMENU hSysMenu)
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent(event);
   }
-  else if (nFlags != MF_SEPARATOR)
+  else if ((nFlags != MF_SEPARATOR) && (nItem != 0) && (nItem != 65535))
   {
     wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, nItem);
     event.SetEventObject( this );
@@ -863,7 +863,7 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
     if ( menuId != -1 )
     {
       wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
+      if (menuBar && menuBar->FindItem(menuId))
       {
         // set status text even if the string is empty - this will at
         // least remove the string from the item which was previously