From dbf75be72527bc3aaca7e8f4f69f6786d2e91684 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Sun, 19 Mar 2000 23:19:52 +0000 Subject: [PATCH] Added a Motif-only extra call to UpdateInfoText() just after frame creation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- demos/life/life.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/demos/life/life.cpp b/demos/life/life.cpp index 27d375cc3c..8b29dca570 100644 --- a/demos/life/life.cpp +++ b/demos/life/life.cpp @@ -160,6 +160,11 @@ bool LifeApp::OnInit() frame->Show(TRUE); SetTopWindow(frame); + // just for Motif +#ifdef __WXMOTIF__ + frame->UpdateInfoText(); +#endif + // enter the main message loop and run the app return TRUE; } @@ -530,7 +535,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent) bmpe = wxBITMAP(east), bmps = wxBITMAP(south); -#ifdef __WXMSW__ +#if !defined(__WXGTK__) && !defined(__WXMOTIF__) bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY)); bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY)); bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY)); @@ -583,6 +588,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent) void LifeNavigator::OnClose(wxCloseEvent& event) { + // avoid if we can if (event.CanVeto()) event.Veto(); else @@ -983,8 +989,9 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event) } } -#if defined(__WXGTK__) || defined(__WXMOTIF__) // what about Motif? - // wxGTK updates the thumb automatically (wxMSW doesn't); reset it back +#if defined(__WXGTK__) || defined(__WXMOTIF__) + // 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) { SetScrollbar(wxHORIZONTAL, m_viewportW, m_viewportW, 3 * m_viewportW); -- 2.45.2