projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied patch 890642: wxRE_ADVANCED flag and docs
[wxWidgets.git]
/
src
/
msw
/
dcscreen.cpp
diff --git
a/src/msw/dcscreen.cpp
b/src/msw/dcscreen.cpp
index 71d61dd7d9aa1b3f9e0d390f07116806014a55a1..a6f3948d1b3452865560c8150d3ffc7af254be46 100644
(file)
--- a/
src/msw/dcscreen.cpp
+++ b/
src/msw/dcscreen.cpp
@@
-1,15
+1,15
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dcscreen.cpp
+// Name:
src/msw/
dcscreen.cpp
// Purpose: wxScreenDC class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Purpose: wxScreenDC class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
-// Licence: wxWindows licence
+// Copyright: (c) Julian Smart
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dcscreen.h"
#endif
#pragma implementation "dcscreen.h"
#endif
@@
-21,28
+21,30
@@
#endif
#ifndef WX_PRECOMP
#endif
#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/window.h"
#endif
#endif
-#include "wx/
dcscreen
.h"
+#include "wx/
msw/private
.h"
-#include
<windows.h>
+#include
"wx/dcscreen.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-#endif
// Create a DC representing the whole screen
// Create a DC representing the whole screen
-wxScreenDC::wxScreenDC(
void
)
+wxScreenDC::wxScreenDC()
{
{
- m_hDC = (WXHDC) ::GetDC(NULL);
- m_hDCCount ++;
+ m_hDC = (WXHDC) ::GetDC((HWND) NULL);
+
+ // the background mode is only used for text background and is set in
+ // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
+ ::SetBkMode( GetHdc(), TRANSPARENT );
}
}
-wxScreenDC::~wxScreenDC(void)
+void wxScreenDC::DoGetSize(int *width, int *height) const
{
{
- SelectOldObjects(m_hDC);
- ::ReleaseDC(NULL, (HDC) m_hDC);
- m_hDC = 0;
- m_hDCCount --;
+ // skip wxWindowDC version because it doesn't work without a valid m_canvas
+ // (which we don't have)
+ wxDC::DoGetSize(width, height);
}
}