AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed OnMenuHighlight, wxPrintData problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-04-06 12:55:44 +00:00
parent 19d40bab31
commit 58abfef64f
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/latex/wx/filedlg.tex
View File

@ -16,9 +16,6 @@ This class represents the file chooser dialog.
\wxheading{See also}
\helpref{wxFileDialog overview}{wxfiledialogoverview}, \helpref{wxFileSelector}{wxfileselector}
%\rtfsp\helpref{wxFileSelectorEx}{wxfileselectorex}
%\helpref{wxLoadFileSelector}{wxloadfileselector},\rtfsp
%\helpref{wxSaveFileSelector}{wxsavefileselector}
\wxheading{Remarks}
@ -43,7 +40,7 @@ Under Windows (only), the wildcard may be a specification for multiple
types of file with a description for each, such as:
\begin{verbatim}
"BMP files (*.bmp) | *.bmp | GIF files (*.gif) | *.gif"
"BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
\end{verbatim}
\latexignore{\rtfignore{\wxheading{Members}}}

2
docs/latex/wx/function.tex
View File

@ -433,7 +433,7 @@ Under Windows (only), the wildcard may be a specification for multiple
types of file with a description for each, such as:
\begin{verbatim}
"BMP files (*.bmp) | *.bmp | GIF files (*.gif) | *.gif"
"BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
\end{verbatim}
The application must check for an empty return value (the user pressed

6
docs/latex/wx/menu.tex
View File

@ -199,7 +199,7 @@ before matching.
\helpref{wxMenu::FindItemForId}{wxmenufinditemforid}
\membersection{wxMenu::FindItemForId}\label{wxmenufinditemforid}
\membersection{wxMenu::FindItemForId}\label{wxmenufinditem}
\constfunc{wxMenuItem*}{FindItemForId}{\param{int}{ id}, \param{wxMenu **}{ menuForItem = NULL}}
@ -504,9 +504,9 @@ The menu item identifier, or -1 if none was found.
Any special menu codes are stripped out of source and target strings
before matching.
\membersection{wxMenuBar::FindItemById}\label{wxmenubarfinditembyid}
\membersection{wxMenuBar::FindItemForId}\label{wxmenubarfinditemforid}
\constfunc{wxMenuItem *}{FindItemById}{\param{int}{ id}}
\constfunc{wxMenuItem *}{FindItemForId}{\param{int}{ id}}
Finds the menu item object associated with the given menu item identifier,

4
src/common/cmndata.cpp
View File

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

2
src/makevc.env
View File

@ -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

4
src/msw/frame.cpp
View File

@ -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