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

font encodings and refresh upon show (after a hide all no update event is sent at least on Panther)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-02-08 06:33:27 +00:00
parent 908d407cf9
commit 16a761847f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mac/carbon/toplevel.cpp
View File

@@ -91,6 +91,7 @@ static const EventTypeSpec eventList[] =
{ kEventClassKeyboard, kEventRawKeyUp } , { kEventClassKeyboard, kEventRawKeyUp } ,
{ kEventClassKeyboard, kEventRawKeyModifiersChanged } , { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
{ kEventClassWindow , kEventWindowShown } ,
{ kEventClassWindow , kEventWindowUpdate } , { kEventClassWindow , kEventWindowUpdate } ,
{ kEventClassWindow , kEventWindowActivated } , { kEventClassWindow , kEventWindowActivated } ,
{ kEventClassWindow , kEventWindowDeactivated } , { kEventClassWindow , kEventWindowDeactivated } ,
@@ -368,6 +369,10 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ; toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
result = noErr ; result = noErr ;
break ; break ;
case kEventWindowShown :
toplevelWindow->Refresh() ;
result = noErr ;
break ;
case kEventWindowClose : case kEventWindowClose :
toplevelWindow->Close() ; toplevelWindow->Close() ;
result = noErr ; result = noErr ;
@@ -774,7 +779,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") ); wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
wxAssociateWinWithMacWindow( m_macWindow , this ) ; wxAssociateWinWithMacWindow( m_macWindow , this ) ;
UMASetWTitle( (WindowRef)m_macWindow , title ) ; UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
if ( wxTopLevelWindowMac::s_macWindowCompositing ) if ( wxTopLevelWindowMac::s_macWindowCompositing )
{ {
::GetRootControl( (WindowRef)m_macWindow, (ControlHandle*)&m_macRootControl ) ; ::GetRootControl( (WindowRef)m_macWindow, (ControlHandle*)&m_macRootControl ) ;
@@ -1082,7 +1087,7 @@ void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
void wxTopLevelWindowMac::SetTitle(const wxString& title) void wxTopLevelWindowMac::SetTitle(const wxString& title)
{ {
wxWindow::SetTitle( title ) ; wxWindow::SetTitle( title ) ;
UMASetWTitle( (WindowRef)m_macWindow , title ) ; UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
} }
bool wxTopLevelWindowMac::Show(bool show) bool wxTopLevelWindowMac::Show(bool show)

9
src/mac/toplevel.cpp
View File

@@ -91,6 +91,7 @@ static const EventTypeSpec eventList[] =
{ kEventClassKeyboard, kEventRawKeyUp } , { kEventClassKeyboard, kEventRawKeyUp } ,
{ kEventClassKeyboard, kEventRawKeyModifiersChanged } , { kEventClassKeyboard, kEventRawKeyModifiersChanged } ,
{ kEventClassWindow , kEventWindowShown } ,
{ kEventClassWindow , kEventWindowUpdate } , { kEventClassWindow , kEventWindowUpdate } ,
{ kEventClassWindow , kEventWindowActivated } , { kEventClassWindow , kEventWindowActivated } ,
{ kEventClassWindow , kEventWindowDeactivated } , { kEventClassWindow , kEventWindowDeactivated } ,
@@ -368,6 +369,10 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ; toplevelWindow->MacActivate( EventTimeToTicks( GetEventTime( event ) ) , false) ;
result = noErr ; result = noErr ;
break ; break ;
case kEventWindowShown :
toplevelWindow->Refresh() ;
result = noErr ;
break ;
case kEventWindowClose : case kEventWindowClose :
toplevelWindow->Close() ; toplevelWindow->Close() ;
result = noErr ; result = noErr ;
@@ -774,7 +779,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") ); wxCHECK_RET( err == noErr, wxT("Mac OS error when trying to create new window") );
wxAssociateWinWithMacWindow( m_macWindow , this ) ; wxAssociateWinWithMacWindow( m_macWindow , this ) ;
UMASetWTitle( (WindowRef)m_macWindow , title ) ; UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
if ( wxTopLevelWindowMac::s_macWindowCompositing ) if ( wxTopLevelWindowMac::s_macWindowCompositing )
{ {
::GetRootControl( (WindowRef)m_macWindow, (ControlHandle*)&m_macRootControl ) ; ::GetRootControl( (WindowRef)m_macWindow, (ControlHandle*)&m_macRootControl ) ;
@@ -1082,7 +1087,7 @@ void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
void wxTopLevelWindowMac::SetTitle(const wxString& title) void wxTopLevelWindowMac::SetTitle(const wxString& title)
{ {
wxWindow::SetTitle( title ) ; wxWindow::SetTitle( title ) ;
UMASetWTitle( (WindowRef)m_macWindow , title ) ; UMASetWTitle( (WindowRef)m_macWindow , title , m_font.GetEncoding() ) ;
} }
bool wxTopLevelWindowMac::Show(bool show) bool wxTopLevelWindowMac::Show(bool show)