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

Include wx/dcscreen.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-09 13:55:29 +00:00
parent 3dbe49e1aa
commit 11dbb4bfab
12 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/cocoa/dcscreen.cpp
View File

@@ -4,14 +4,16 @@
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/03/16 // Created: 2003/03/16
// RCS-ID: $Id: // RCS-ID: $Id$
// Copyright: (c) 2002 David Elliott // Copyright: (c) 2002 David Elliott
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/dcscreen.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dcscreen.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -22,15 +24,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxDC)
wxScreenDC::wxScreenDC(void) wxScreenDC::wxScreenDC(void)
{ {
m_ok = false; m_ok = false;
}; }
wxScreenDC::wxScreenDC( wxDC *WXUNUSED(dc) ) wxScreenDC::wxScreenDC( wxDC *WXUNUSED(dc) )
{ {
m_ok = false; m_ok = false;
}; }
wxScreenDC::~wxScreenDC(void) wxScreenDC::~wxScreenDC(void)
{ {
} }

5
src/generic/sashwin.cpp
View File

@@ -20,19 +20,20 @@
#if wxUSE_SASH #if wxUSE_SASH
#include "wx/sashwin.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/dcscreen.h"
#endif #endif
#include "wx/math.h" #include "wx/math.h"
#include <stdlib.h> #include <stdlib.h>
#include "wx/dcscreen.h"
#include "wx/sashwin.h"
#include "wx/laywin.h" #include "wx/laywin.h"
DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED) DEFINE_EVENT_TYPE(wxEVT_SASH_DRAGGED)

12
src/gtk/minifram.cpp
View File

@@ -10,11 +10,13 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/minifram.h"
#if wxUSE_MINIFRAME #if wxUSE_MINIFRAME
#include "wx/dcscreen.h" #include "wx/minifram.h"
#ifndef WX_PRECOMP
#include "wx/dcscreen.h"
#endif
#include "gtk/gtk.h" #include "gtk/gtk.h"
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
@@ -167,7 +169,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
if (!win->m_isDragging) return TRUE; if (!win->m_isDragging) return TRUE;
win->m_isDragging = FALSE; win->m_isDragging = false;
int x = (int)gdk_event->x; int x = (int)gdk_event->x;
int y = (int)gdk_event->y; int y = (int)gdk_event->y;
@@ -334,4 +336,4 @@ void wxMiniFrame::SetTitle( const wxString &title )
gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true ); gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
} }
#endif #endif // wxUSE_MINIFRAME

12
src/gtk1/minifram.cpp
View File

@@ -10,11 +10,13 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/minifram.h"
#if wxUSE_MINIFRAME #if wxUSE_MINIFRAME
#include "wx/dcscreen.h" #include "wx/minifram.h"
#ifndef WX_PRECOMP
#include "wx/dcscreen.h"
#endif
#include "gtk/gtk.h" #include "gtk/gtk.h"
#include "wx/gtk1/win_gtk.h" #include "wx/gtk1/win_gtk.h"
@@ -219,7 +221,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
if (!win->m_isDragging) return TRUE; if (!win->m_isDragging) return TRUE;
win->m_isDragging = FALSE; win->m_isDragging = false;
int x = (int)gdk_event->x; int x = (int)gdk_event->x;
int y = (int)gdk_event->y; int y = (int)gdk_event->y;
@@ -400,4 +402,4 @@ void wxMiniFrame::SetTitle( const wxString &title )
gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL ); gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL );
} }
#endif #endif // wxUSE_MINIFRAME

14
src/mac/carbon/dcscreen.cpp
View File

@@ -1,17 +1,18 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcscreen.cpp // Name: src/mac/carbon/dcscreen.cpp
// Purpose: wxScreenDC class // Purpose: wxScreenDC class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 1998-01-01 // Created: 1998-01-01
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
@@ -24,7 +25,7 @@ wxScreenDC::wxScreenDC()
GetPort( &port ) ; GetPort( &port ) ;
SetPort( (GrafPtr) m_macPort ) ; SetPort( (GrafPtr) m_macPort ) ;
Point pt = { 0,0 } ; Point pt = { 0,0 } ;
LocalToGlobal( &pt ) ; LocalToGlobal( &pt ) ;
SetPort( port ) ; SetPort( port ) ;
m_macLocalOrigin.x = -pt.h ; m_macLocalOrigin.x = -pt.h ;
m_macLocalOrigin.y = -pt.v ; m_macLocalOrigin.y = -pt.v ;
@@ -43,17 +44,17 @@ wxScreenDC::wxScreenDC()
m_maxY = screenBits.bounds.bottom ; m_maxY = screenBits.bounds.bottom ;
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
m_graphicContext = new wxMacCGContext( port ) ; m_graphicContext = new wxMacCGContext( port ) ;
#else #else
MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ; MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ;
OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ; OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
#endif #endif
m_ok = TRUE ; m_ok = true ;
} }
wxScreenDC::~wxScreenDC() wxScreenDC::~wxScreenDC()
{ {
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
delete m_graphicContext ; delete m_graphicContext ;
m_graphicContext = NULL ; m_graphicContext = NULL ;
@@ -62,4 +63,3 @@ wxScreenDC::~wxScreenDC()
if ( m_macPort ) if ( m_macPort )
DisposePort( (CGrafPtr) m_macPort ) ; DisposePort( (CGrafPtr) m_macPort ) ;
} }

28
src/mac/classic/dcscreen.cpp
View File

@@ -1,15 +1,18 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcscreen.cpp // Name: src/mac/classic/dcscreen.cpp
// Purpose: wxScreenDC class // Purpose: wxScreenDC class
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 1998-01-01 // Created: 1998-01-01
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Stefan Csomor // Copyright: (c) Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
@@ -23,7 +26,7 @@ wxScreenDC::wxScreenDC()
GetPort( &port ) ; GetPort( &port ) ;
SetPort( (GrafPtr) m_macPort ) ; SetPort( (GrafPtr) m_macPort ) ;
Point pt = { 0,0 } ; Point pt = { 0,0 } ;
LocalToGlobal( &pt ) ; LocalToGlobal( &pt ) ;
SetPort( port ) ; SetPort( port ) ;
m_macLocalOrigin.x = -pt.h ; m_macLocalOrigin.x = -pt.h ;
m_macLocalOrigin.y = -pt.v ; m_macLocalOrigin.y = -pt.v ;
@@ -32,17 +35,17 @@ wxScreenDC::wxScreenDC()
m_macLocalOrigin.x = 0 ; m_macLocalOrigin.x = 0 ;
m_macLocalOrigin.y = 0 ; m_macLocalOrigin.y = 0 ;
#endif #endif
m_ok = TRUE ; m_ok = true ;
BitMap screenBits; BitMap screenBits;
GetQDGlobalsScreenBits( &screenBits ); GetQDGlobalsScreenBits( &screenBits );
m_minX = screenBits.bounds.left ; m_minX = screenBits.bounds.left ;
#if TARGET_CARBON #if TARGET_CARBON
SInt16 height ; SInt16 height ;
GetThemeMenuBarHeight( &height ) ; GetThemeMenuBarHeight( &height ) ;
m_minY = screenBits.bounds.top + height ; m_minY = screenBits.bounds.top + height ;
#else #else
m_minY = screenBits.bounds.top + LMGetMBarHeight() ; m_minY = screenBits.bounds.top + LMGetMBarHeight() ;
#endif #endif
m_maxX = screenBits.bounds.right ; m_maxX = screenBits.bounds.right ;
m_maxY = screenBits.bounds.bottom ; m_maxY = screenBits.bounds.bottom ;
MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ; MacSetRectRgn( (RgnHandle) m_macBoundaryClipRgn , m_minX , m_minY , m_maxX , m_maxY ) ;
@@ -54,4 +57,3 @@ wxScreenDC::~wxScreenDC()
{ {
// TODO // TODO
} }

8
src/mgl/dcscreen.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcscreen.cpp // Name: src/mgl/dcscreen.cpp
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Id: $Id$ // Id: $Id$
// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
@@ -14,14 +14,16 @@
#endif #endif
#include "wx/dcscreen.h" #include "wx/dcscreen.h"
#include "wx/mgl/private.h" #include "wx/mgl/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)
wxScreenDC::wxScreenDC() : wxDC() wxScreenDC::wxScreenDC()
:wxDC()
{ {
SetMGLDC(g_displayDC, FALSE /* no ownership */); SetMGLDC(g_displayDC, FALSE /* no ownership */);
// VS: we have to hide the mouse, otherwise rendering artifacts may occur // VS: we have to hide the mouse, otherwise rendering artifacts may occur
MS_obscure(); MS_obscure();
} }

2
src/mgl/window.cpp
View File

@@ -35,6 +35,7 @@
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/dcscreen.h"
#endif #endif
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
@@ -43,7 +44,6 @@
#include "wx/sysopt.h" #include "wx/sysopt.h"
#include "wx/mgl/private.h" #include "wx/mgl/private.h"
#include "wx/dcscreen.h"
#include "wx/caret.h" #include "wx/caret.h"
#include <mgraph.hpp> #include <mgraph.hpp>

7
src/msw/dcscreen.cpp
View File

@@ -13,9 +13,11 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/dcscreen.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"
#include "wx/window.h" #include "wx/window.h"
@@ -23,8 +25,6 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/dcscreen.h"
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)
// Create a DC representing the whole screen // Create a DC representing the whole screen
@@ -36,4 +36,3 @@ wxScreenDC::wxScreenDC()
// DrawText() to OPAQUE as required, otherwise always TRANSPARENT // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
::SetBkMode( GetHdc(), TRANSPARENT ); ::SetBkMode( GetHdc(), TRANSPARENT );
} }

2
src/os2/checklst.cpp
View File

@@ -25,6 +25,7 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/dcscreen.h"
#endif #endif
#include "wx/colour.h" #include "wx/colour.h"
@@ -33,7 +34,6 @@
#include "wx/listbox.h" #include "wx/listbox.h"
#include "wx/ownerdrw.h" #include "wx/ownerdrw.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/dcscreen.h"
#define INCL_PM #define INCL_PM
#include <os2.h> #include <os2.h>

24
src/os2/dcscreen.cpp
View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcscreen.cpp // Name: src/os2/dcscreen.cpp
// Purpose: wxScreenDC class // Purpose: wxScreenDC class
// Author: David Webster // Author: David Webster
// Modified by: // Modified by:
// Created: 10/14/99 // Created: 10/14/99
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) David Webster // Copyright: (c) David Webster
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
@@ -17,15 +17,15 @@
#define INCL_PM #define INCL_PM
#include<os2.h> #include<os2.h>
#include "wx/dcscreen.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"
#include "wx/window.h" #include "wx/window.h"
#endif #endif
#include "wx/os2/private.h" #include "wx/os2/private.h"
#include "wx/dcscreen.h"
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
// Create a DC representing the whole screen // Create a DC representing the whole screen
@@ -36,17 +36,13 @@ wxScreenDC::wxScreenDC()
::GpiSetBackMix(m_hPS, BM_LEAVEALONE); ::GpiSetBackMix(m_hPS, BM_LEAVEALONE);
} // end of wxScreenDC::wxScreenDC() } // end of wxScreenDC::wxScreenDC()
void wxScreenDC::DoGetSize( void wxScreenDC::DoGetSize( int* pnWidth,
int* pnWidth int* pnHeight ) const
, int* pnHeight
) const
{ {
// //
// Skip wxWindowDC version because it doesn't work without a valid m_canvas // Skip wxWindowDC version because it doesn't work without a valid m_canvas
// (which we don't have) // (which we don't have)
// //
wxDC::DoGetSize( pnWidth wxDC::DoGetSize( pnWidth, pnHeight );
,pnHeight
);
} // end of wxScreenDC::DoGetSize
} // end of wxScreenDC::DoGetSize

7
src/palmos/dcscreen.cpp
View File

@@ -13,16 +13,16 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/dcscreen.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/string.h" #include "wx/string.h"
#include "wx/window.h" #include "wx/window.h"
#endif #endif
#include "wx/dcscreen.h"
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC) IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
// Create a DC representing the whole screen // Create a DC representing the whole screen
@@ -33,4 +33,3 @@ wxScreenDC::wxScreenDC()
void wxScreenDC::DoGetSize(int *width, int *height) const void wxScreenDC::DoGetSize(int *width, int *height) const
{ {
} }