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

Dialog processing updates and some timer fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2002-07-15 21:50:34 +00:00
parent 6bad4c327c
commit 0256cfeb6d
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/os2/app.cpp
View File

@ -422,6 +422,18 @@ bool wxApp::RegisterWindowClasses(
wxLogLastError(sError); wxLogLastError(sError);
return FALSE; return FALSE;
} }
if (!::WinRegisterClass( vHab
,wxCanvasClassNameNR
,wxWndProc
,CS_HITTEST | CS_SYNCPAINT
,sizeof(ULONG)
))
{
vError = ::WinGetLastError(vHab);
sError = wxPMErrorToStr(vError);
wxLogLastError(sError);
return FALSE;
}
return TRUE; return TRUE;
} // end of wxApp::RegisterWindowClasses } // end of wxApp::RegisterWindowClasses

4
src/os2/toolbar.cpp
View File

@ -976,7 +976,7 @@ void wxToolBar::OnMouseEvent(
m_pToolTip = new wxToolTip(pTool->GetShortHelp()); m_pToolTip = new wxToolTip(pTool->GetShortHelp());
m_vXMouse = (wxCoord)vPoint.x; m_vXMouse = (wxCoord)vPoint.x;
m_vYMouse = (wxCoord)vPoint.y; m_vYMouse = (wxCoord)vPoint.y;
m_vToolTimer.Start(3000L, TRUE); m_vToolTimer.Start(1000L, TRUE);
} }
if (!pTool->IsToggled()) if (!pTool->IsToggled())
RaiseTool(pTool); RaiseTool(pTool);
@ -1447,7 +1447,7 @@ void wxToolBar::OnTimer (
m_pToolTip->DisplayToolTipWindow(vPos); m_pToolTip->DisplayToolTipWindow(vPos);
m_vToolTimer.Stop(); m_vToolTimer.Stop();
m_vToolExpTimer.Start(3000L, TRUE); m_vToolExpTimer.Start(4000L, TRUE);
} }
else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId()) else if (rEvent.GetId() == m_vToolExpTimer.GetTimerId())
{ {

7
src/os2/toplevel.cpp
View File

@ -83,9 +83,10 @@ MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd)
case WM_INITDLG: case WM_INITDLG:
// //
// For this message, returning TRUE tells system to set focus to // For this message, returning TRUE tells system to set focus to
// the first control in the dialog box, but as we set the focus // the first control in the dialog box, but we set the focus
// ourselves, we return FALSE from here as well, so fall through // ourselves, however in OS/2 we must return true to enable the dialog
// //
return (MRESULT)TRUE;
default: default:
// //
// For all the other ones, FALSE means that we didn't process the // For all the other ones, FALSE means that we didn't process the
@ -396,7 +397,7 @@ bool wxTopLevelWindowOS2::CreateDialog(
,nY ,nY
,nWidth ,nWidth
,nHeight ,nHeight
,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW | SWP_ACTIVATE
); );
::WinQueryWindowPos(GetHwnd(), GetSwp()); ::WinQueryWindowPos(GetHwnd(), GetSwp());
m_hFrame = m_hWnd; m_hFrame = m_hWnd;

15
src/os2/wx23.def
View File

@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL CODE LOADONCALL
EXPORTS EXPORTS
;From library: H:\Dev\Wx2\WxWindows\Lib\wx.lib ;From library: H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
;From object file: dummy.cpp ;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
wxDummyChar wxDummyChar
@ -1153,6 +1153,8 @@ EXPORTS
OnNewDocument__10wxDocumentFv OnNewDocument__10wxDocumentFv
;wxView::OnCreatePrintout() ;wxView::OnCreatePrintout()
OnCreatePrintout__6wxViewFv OnCreatePrintout__6wxViewFv
;wxDocument::NotifyClosing()
NotifyClosing__10wxDocumentFv
;wxDocManager::GetNoHistoryFiles() const ;wxDocManager::GetNoHistoryFiles() const
GetNoHistoryFiles__12wxDocManagerCFv GetNoHistoryFiles__12wxDocManagerCFv
;wxFileHistory::AddFilesToMenu() ;wxFileHistory::AddFilesToMenu()
@ -1805,6 +1807,7 @@ EXPORTS
;wxMouseEvent::Assign(const wxMouseEvent&) ;wxMouseEvent::Assign(const wxMouseEvent&)
Assign__12wxMouseEventFRC12wxMouseEvent Assign__12wxMouseEventFRC12wxMouseEvent
wxEVT_SCROLL_LINEUP wxEVT_SCROLL_LINEUP
wxEVT_SCROLL_ENDSCROLL
wxEVT_PAINT wxEVT_PAINT
wxEVT_NULL wxEVT_NULL
wxEVT_NC_RIGHT_UP wxEVT_NC_RIGHT_UP
@ -4658,12 +4661,14 @@ EXPORTS
Exists__9wxProcessFi Exists__9wxProcessFi
;wxConstructorForwxProcess() ;wxConstructorForwxProcess()
wxConstructorForwxProcess__Fv wxConstructorForwxProcess__Fv
;wxProcess::Init(wxEvtHandler*,int,unsigned long)
Init__9wxProcessFP12wxEvtHandleriUl
__vft9wxProcess8wxObject
;wxProcess::Kill(int,wxSignal) ;wxProcess::Kill(int,wxSignal)
Kill__9wxProcessFi8wxSignal Kill__9wxProcessFi8wxSignal
__vft9wxProcess8wxObject
;wxProcess::Open(const wxString&,int)
Open__9wxProcessFRC8wxStringi
wxEVT_END_PROCESS wxEVT_END_PROCESS
;wxProcess::Init(wxEvtHandler*,int,int)
Init__9wxProcessFP12wxEvtHandleriT2
;wxProcess::~wxProcess() ;wxProcess::~wxProcess()
__dt__9wxProcessFv __dt__9wxProcessFv
;wxConstructorForwxProcessEvent() ;wxConstructorForwxProcessEvent()
@ -6616,6 +6621,8 @@ EXPORTS
sm_classwxVariantDataChar__17wxVariantDataChar sm_classwxVariantDataChar__17wxVariantDataChar
;wxVariant::operator==(void*) const ;wxVariant::operator==(void*) const
__eq__9wxVariantCFPv __eq__9wxVariantCFPv
;wxVariant::NullList()
NullList__9wxVariantFv
;wxVariant::GetList() const ;wxVariant::GetList() const
GetList__9wxVariantCFv GetList__9wxVariantCFv
;wxVariant::GetCount() const ;wxVariant::GetCount() const