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

Added a Motif-only extra call to UpdateInfoText() just after frame creation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guillermo Rodriguez Garcia
2000-03-19 23:19:52 +00:00
parent ceded8b925
commit dbf75be725
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
demos/life/life.cpp
View File

@@ -160,6 +160,11 @@ bool LifeApp::OnInit()
frame->Show(TRUE); frame->Show(TRUE);
SetTopWindow(frame); SetTopWindow(frame);
// just for Motif
#ifdef __WXMOTIF__
frame->UpdateInfoText();
#endif
// enter the main message loop and run the app // enter the main message loop and run the app
return TRUE; return TRUE;
} }
@@ -530,7 +535,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
bmpe = wxBITMAP(east), bmpe = wxBITMAP(east),
bmps = wxBITMAP(south); bmps = wxBITMAP(south);
#ifdef __WXMSW__ #if !defined(__WXGTK__) && !defined(__WXMOTIF__)
bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY)); bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY)); bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY));
bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY)); bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY));
@@ -583,6 +588,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
void LifeNavigator::OnClose(wxCloseEvent& event) void LifeNavigator::OnClose(wxCloseEvent& event)
{ {
// avoid if we can
if (event.CanVeto()) if (event.CanVeto())
event.Veto(); event.Veto();
else else
@@ -983,8 +989,9 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
} }
} }
#if defined(__WXGTK__) || defined(__WXMOTIF__) // what about Motif? #if defined(__WXGTK__) || defined(__WXMOTIF__)
// wxGTK updates the thumb automatically (wxMSW doesn't); reset it back // wxGTK and wxMotif update the thumb automatically (wxMSW doesn't);
// so reset it back as we always want it to be in the same position.
if (type != wxEVT_SCROLLWIN_THUMBTRACK) if (type != wxEVT_SCROLLWIN_THUMBTRACK)
{ {
SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW); SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW);