diff options
| author | Patrick Luby <pluby@openoffice.org> | 2000-11-16 05:41:23 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2000-11-16 05:41:23 +0000 |
| commit | 2def2e0e8fa7fd640b86c6c2b4b2f6ef685fe767 (patch) | |
| tree | 74bcae5d0d2fe8d02b5bb3b3f65c7e63ae4a7f41 /vcl | |
| parent | 52ffe5ce29106c65b23547397d18659f30f57834 (diff) | |
Added back dummy SALFRAMEPROC
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 6e73cefd2490..c77ac26825e0 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salframe.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: pluby $ $Date: 2000-11-15 19:31:19 $ + * last change: $Author: pluby $ $Date: 2000-11-16 06:41:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,13 @@ // ======================================================================= +static long ImplSalFrameCallbackDummy( void*, SalFrame*, USHORT, const void* ) +{ + return 0; +} + +// ======================================================================= + SalFrame::SalFrame() { SalData* pSalData = GetSalData(); @@ -88,7 +95,7 @@ SalFrame::SalFrame() maFrameData.mhWnd = 0; maFrameData.mpGraphics = NULL; maFrameData.mpInst = NULL; - maFrameData.mpProc = NULL; + maFrameData.mpProc = ImplSalFrameCallbackDummy; maFrameData.mnInputLang = 0; maFrameData.mnInputCodePage = 0; maFrameData.mbGraphics = FALSE; @@ -349,4 +356,9 @@ void SalFrame::Beep( SoundType eSoundType ) void SalFrame::SetCallback( void* pInst, SALFRAMEPROC pProc ) { + maFrameData.mpInst = pInst; + if ( pProc ) + maFrameData.mpProc = pProc; + else + maFrameData.mpProc = ImplSalFrameCallbackDummy; } |