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 5b25f590d4a09d3d7f45abcdab9dd4a0c110ebf8..b223aaa5e394d136bc6d8c734ad174405b0699a7 100644 (file)
--- a/src/palmos/dcscreen.cpp
+++ b/src/palmos/dcscreen.cpp
@@ -13,24 +13,24 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#include "wx/palmos/dcscreen.h"
+
 #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
-wxScreenDC::wxScreenDC()
+wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) :
+    wxPalmDCImpl( owner )
 {
 }
 
-void wxScreenDC::DoGetSize(int *width, int *height) const
+void wxScreenDCImpl::DoGetSize (int *w, int *h) const
 {
 }
-