Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / dcscreen.cpp

diff --git a/src/palmos/dcscreen.cpp b/src/palmos/dcscreen.cpp
index 965ac3db5cf1d1e9162c7fae10a08a4422d443ae..b223aaa5e394d136bc6d8c734ad174405b0699a7 100644 (file)
--- a/src/palmos/dcscreen.cpp
+++ b/src/palmos/dcscreen.cpp
@@ -9,32 +9,28 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcscreen.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/palmos/dcscreen.h"
+

 #ifndef WX_PRECOMP
    #include "wx/string.h"
    #include "wx/window.h"
 #endif
 
 #ifndef WX_PRECOMP
    #include "wx/string.h"
    #include "wx/window.h"
 #endif
 

-#include "wx/dcscreen.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxPalmDCImpl)

 
 // Create a DC representing the whole screen
 
 // Create a DC representing the whole screen

-wxScreenDC::wxScreenDC()
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) :
+    wxPalmDCImpl( owner )

 {
 }
 
 {
 }
 

-void wxScreenDC::DoGetSize(int *width, int *height) const
+void wxScreenDCImpl::DoGetSize (int *w, int *h) const

 {
 }
 {
 }

-