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

Applied patch [ 592063 ] generic notebook does not OnSelChanging

Browse Source 
Misc other mods


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-08 08:54:49 +00:00
parent c266945cab
commit 1c507b171a
4 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/tech/tn0003.txt
View File

@@ -9,6 +9,8 @@ wxWindows uses Tex2RTF to process Latex-like input files (.tex)
and output in HTML, WinHelp RTF and Word RTF. Tex2RTF is provided and output in HTML, WinHelp RTF and Word RTF. Tex2RTF is provided
in the wxWindows distribution and in the CVS archive, under in the wxWindows distribution and in the CVS archive, under
utils/tex2rtf. Please start by perusing the Tex2RTF manual. utils/tex2rtf. Please start by perusing the Tex2RTF manual.
See http://www.wxwindows.org/tex2rtf/index.htm for a browseable
manual and binaries for specific platforms.
If adding to the existing manual in docs/latex/wx, you need to If adding to the existing manual in docs/latex/wx, you need to
create a new .tex file, e.g. myclass.tex, and add it to the create a new .tex file, e.g. myclass.tex, and add it to the

2
include/wx/generic/notebook.h
View File

@@ -54,6 +54,8 @@ public:
// Called when a tab is activated // Called when a tab is activated
virtual void OnTabActivate(int activateId, int deactivateId); virtual void OnTabActivate(int activateId, int deactivateId);
// Allows vetoing
virtual bool OnTabPreActivate(int activateId, int deactivateId);
protected: protected:
wxNotebook* m_notebook; wxNotebook* m_notebook;

32
src/generic/notebook.cpp
View File

@@ -679,4 +679,36 @@ void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
m_notebook->GetEventHandler()->ProcessEvent(event); m_notebook->GetEventHandler()->ProcessEvent(event);
} }
// Allows Vetoing
bool wxNotebookTabView::OnTabPreActivate(int activateId, int deactivateId)
{
bool retval = TRUE;
if (m_notebook)
{
wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_notebook->GetId());
#if defined (__WIN16__)
int activatePos = activateId;
int deactivatePos = deactivateId;
#else
// Translate from wxTabView's ids (which aren't position-dependent)
// to wxNotebook's (which are).
wxNotebookPage* pActive = (wxNotebookPage*) activateId;
wxNotebookPage* pDeactive = (wxNotebookPage*) deactivateId;
int activatePos = m_notebook->FindPagePosition(pActive);
int deactivatePos = m_notebook->FindPagePosition(pDeactive);
#endif
event.SetEventObject(m_notebook);
event.SetSelection(activatePos);
event.SetOldSelection(deactivatePos);
if (m_notebook->GetEventHandler()->ProcessEvent(event))
{
retval = event.IsAllowed();
}
}
return retval;
}

3
utils/tex2rtf/distrib/zipdistinno.bat
View File

@@ -105,6 +105,9 @@ start "Inno Setup" /w %innocmd%
Rem Rename to give it a version Rem Rename to give it a version
move setup.exe tex2rtf_%ver_filename%_setup.exe move setup.exe tex2rtf_%ver_filename%_setup.exe
Rem Copy the source
move %src%\tex2rtf_src.zip %dest%\tex2rtf-source-%tex2rtfver%.zip
Rem clean up files Rem clean up files
cd %src% cd %src%
erase /EFY *.bmp *.htm *.exe *.hlp *.cnt *.txt *.rtf *.doc *.gif *.jpg *.manifest *.chm erase /EFY *.bmp *.htm *.exe *.hlp *.cnt *.txt *.rtf *.doc *.gif *.jpg *.manifest *.chm