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

Fixed drawing sample compilo for wxMotif (doesn't have wxRegion::Offset)

Browse Source 
Put m_ok earlier in SelectBitmap, else get assert after SelectObject(wxNullBitmap)
'Fixed' longlong to long conversion messages by redefinging GetMillisecondsTime


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2002-04-22 11:19:11 +00:00
parent 9b66c26ae7
commit 4cae9a20a8
5 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samples/drawing/drawing.cpp
View File

@ -878,9 +878,10 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)
dc.DestroyClippingRegion();
wxRegion region(x + 110, y + 20, 100, 270);
#ifndef __WXMOTIF__
if ( !firstTime )
region.Offset(10, 10);
#endif
dc.SetClippingRegion(region);
dc.SetBrush( *wxGREY_BRUSH );

5
src/generic/timer.cpp
View File

@ -43,7 +43,10 @@
extern "C" ulong _EVT_getTicks();
#define GetMillisecondsTime() _EVT_getTicks()
#else
#define GetMillisecondsTime() wxGetLocalTimeMillis().ToLong()
// #define GetMillisecondsTime() wxGetLocalTimeMillis().ToLong()
// Suppresses the debug warning in ToLong. FIXME: check
// that we don't drastically lose precision
#define GetMillisecondsTime() (unsigned long) wxGetLocalTimeMillis().GetValue()
#endif
// ----------------------------------------------------------------------------

2
src/motif/dcmemory.cpp
View File

@ -119,6 +119,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
&gcvalues);
m_backgroundPixel = (int) gcvalues.background;
m_ok = TRUE;
// Get the current Font so we can set it back later
XGCValues valReturn;
@ -133,7 +134,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
SetOptimization(oldOpt);
m_ok = TRUE;
}
else
{

7
src/x11/app.cpp
View File

@ -782,7 +782,12 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
#endif
{
// wxLogDebug( "FocusIn from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
#if 0
wxString msg;
msg.Printf( "FocusIn from %s of type %s\n", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
printf(msg.c_str());
#endif
wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
focusEvent.SetEventObject(win);
focusEvent.SetWindow( g_prevFocus );

13
src/x11/window.cpp
View File

@ -393,6 +393,11 @@ void wxWindowX11::SetFocus()
{
m_needsInputFocus = TRUE;
}
#if 0
wxString msg;
msg.Printf("SetFocus: %s\n", GetClassInfo()->GetClassName());
printf(msg.c_str());
#endif
}
// Get the window with the focus
@ -1232,7 +1237,15 @@ void wxWindowX11::OnInternalIdle()
// Set the input focus if couldn't do it before
if (m_needsInputFocus)
{
#if 0
wxString msg;
msg.Printf("Setting focus for %s from OnInternalIdle\n", GetClassInfo()->GetClassName());
printf(msg.c_str());
#endif
SetFocus();
// If it couldn't set the focus now, there's
// no point in trying again.
m_needsInputFocus = FALSE;
}
}