added the static function GetLabelText() to wxStaticText which was mentioned in the...

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

diff --git a/src/palmos/dc.cpp b/src/palmos/dc.cpp
index 46471e3ee6ad06319b3e6095b11a9280c9abbda6..38c0ae1d51c3d0266c311f26939e2d45a42b3ba5 100644 (file)
--- a/src/palmos/dc.cpp
+++ b/src/palmos/dc.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/palmos/dc.cpp

 // Purpose:     wxDC class
 // Purpose:     wxDC class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

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

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


@@ -38,11 +34,11 @@
     #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/icon.h"
     #include "wx/dcmemory.h"
     #include "wx/log.h"
     #include "wx/icon.h"

+    #include "wx/dcprint.h"
+    #include "wx/module.h"

 #endif
 
 #include "wx/sysopt.h"
 #endif
 
 #include "wx/sysopt.h"

-#include "wx/dcprint.h"
-#include "wx/module.h"

 #include "wx/dynload.h"
 
 #ifdef wxHAVE_RAW_BITMAP
 #include "wx/dynload.h"
 
 #ifdef wxHAVE_RAW_BITMAP


@@ -50,7 +46,6 @@
 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>

-#include <math.h>

 
 #ifndef AC_SRC_ALPHA
 #define AC_SRC_ALPHA 1
 
 #ifndef AC_SRC_ALPHA
 #define AC_SRC_ALPHA 1


@@ -72,11 +67,6 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 

-// usually this is defined in math.h
-#ifndef M_PI
-    static const double M_PI = 3.14159265358979323846;
-#endif // M_PI
-

 #define DSTCOPY 0x00AA0029
 
 // ---------------------------------------------------------------------------
 #define DSTCOPY 0x00AA0029
 
 // ---------------------------------------------------------------------------


@@ -340,7 +330,7 @@ wxCoord wxDC::GetCharWidth() const
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *font) const
+                           const wxFont *font) const

 {
 }
 
 {
 }
 


@@ -381,42 +371,42 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
 // coordinates transformations
 // ---------------------------------------------------------------------------
 

-wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
+wxCoord wxDC::DeviceToLogicalX(wxCoord x) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
+wxCoord wxDC::DeviceToLogicalXRel(wxCoord x) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
+wxCoord wxDC::DeviceToLogicalY(wxCoord y) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
+wxCoord wxDC::DeviceToLogicalYRel(wxCoord y) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
+wxCoord wxDC::LogicalToDeviceX(wxCoord x) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
+wxCoord wxDC::LogicalToDeviceXRel(wxCoord x) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
+wxCoord wxDC::LogicalToDeviceY(wxCoord y) const

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
+wxCoord wxDC::LogicalToDeviceYRel(wxCoord y) const

 {
     return 0;
 }
 {
     return 0;
 }


@@ -507,4 +497,3 @@ private:
 IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 #endif // wxUSE_DC_CACHEING
 IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 #endif // wxUSE_DC_CACHEING

-