Don't need to use wxHAVE_RAW_BITMAP any more.

[wxWidgets.git] / src / dfb / pen.cpp

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index d72740cdc8231be939452e28d97ce8e2d6eebf38..21d36f623ea4f78b155ea7e0cec135aed34a0de3 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -26,7 +26,7 @@
 // wxPen
 //-----------------------------------------------------------------------------
 
 // wxPen
 //-----------------------------------------------------------------------------
 

-class wxPenRefData: public wxObjectRefData
+class wxPenRefData : public wxGDIRefData

 {
 public:
     wxPenRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
 {
 public:
     wxPenRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)


@@ -38,11 +38,13 @@ public:
     wxPenRefData(const wxPenRefData& data)
         : m_style(data.m_style), m_colour(data.m_colour) {}
 
     wxPenRefData(const wxPenRefData& data)
         : m_style(data.m_style), m_colour(data.m_colour) {}
 

+    virtual bool IsOk() const { return m_colour.IsOk(); }
+

     void SetStyle(int style)
     {
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
     void SetStyle(int style)
     {
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {

-            wxFAIL_MSG( _T("only wxSOLID and wxTRANSPARENT styles are supported") );
+            wxFAIL_MSG( "only wxSOLID and wxTRANSPARENT styles are supported" );

             style = wxSOLID;
         }
 
             style = wxSOLID;
         }
 


@@ -61,14 +63,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPen::wxPen(const wxColour &colour, int width, int style)
 {
 
 wxPen::wxPen(const wxColour &colour, int width, int style)
 {

-    wxASSERT_MSG( width <= 1, _T("only width=0,1 are supported") );
+    wxASSERT_MSG( width <= 1, "only width=0,1 are supported" );

 
     m_refData = new wxPenRefData(colour, style);
 }
 
 wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 {
 
     m_refData = new wxPenRefData(colour, style);
 }
 
 wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 {

-    wxFAIL_MSG( _T("stipple pens not supported") );
+    wxFAIL_MSG( "stipple pens not supported" );

 
     m_refData = new wxPenRefData();
 }
 
     m_refData = new wxPenRefData();
 }


@@ -87,7 +89,7 @@ void wxPen::SetColour(const wxColour &colour)
 
 void wxPen::SetDashes(int WXUNUSED(number_of_dashes), const wxDash *WXUNUSED(dash))
 {
 
 void wxPen::SetDashes(int WXUNUSED(number_of_dashes), const wxDash *WXUNUSED(dash))
 {

-    wxFAIL_MSG( _T("SetDashes not implemented") );
+    wxFAIL_MSG( "SetDashes not implemented" );

 }
 
 void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue)
 }
 
 void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue)


@@ -98,12 +100,12 @@ void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue
 
 void wxPen::SetCap(int WXUNUSED(capStyle))
 {
 
 void wxPen::SetCap(int WXUNUSED(capStyle))
 {

-    wxFAIL_MSG( _T("SetCap not implemented") );
+    wxFAIL_MSG( "SetCap not implemented" );

 }
 
 void wxPen::SetJoin(int WXUNUSED(joinStyle))
 {
 }
 
 void wxPen::SetJoin(int WXUNUSED(joinStyle))
 {

-    wxFAIL_MSG( _T("SetJoin not implemented") );
+    wxFAIL_MSG( "SetJoin not implemented" );

 }
 
 void wxPen::SetStyle(int style)
 }
 
 void wxPen::SetStyle(int style)


@@ -114,17 +116,17 @@ void wxPen::SetStyle(int style)
 
 void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
 {
 
 void wxPen::SetStipple(const wxBitmap& WXUNUSED(stipple))
 {

-    wxFAIL_MSG( _T("SetStipple not implemented") );
+    wxFAIL_MSG( "SetStipple not implemented" );

 }
 
 void wxPen::SetWidth(int width)
 {
 }
 
 void wxPen::SetWidth(int width)
 {

-    wxASSERT_MSG( width <= 1, _T("only width=0,1 are implemented") );
+    wxASSERT_MSG( width <= 1, "only width=0,1 are implemented" );

 }
 
 int wxPen::GetDashes(wxDash **ptr) const
 {
 }
 
 int wxPen::GetDashes(wxDash **ptr) const
 {

-    wxFAIL_MSG( _T("GetDashes not implemented") );
+    wxFAIL_MSG( "GetDashes not implemented" );

 
     *ptr = NULL;
     return 0;
 
     *ptr = NULL;
     return 0;


@@ -132,14 +134,14 @@ int wxPen::GetDashes(wxDash **ptr) const
 
 int wxPen::GetDashCount() const
 {
 
 int wxPen::GetDashCount() const
 {

-    wxFAIL_MSG( _T("GetDashCount not implemented") );
+    wxFAIL_MSG( "GetDashCount not implemented" );

 
     return 0;
 }
 
 wxDash* wxPen::GetDash() const
 {
 
     return 0;
 }
 
 wxDash* wxPen::GetDash() const
 {

-    wxFAIL_MSG( _T("GetDash not implemented") );
+    wxFAIL_MSG( "GetDash not implemented" );

 
     return NULL;
 }
 
     return NULL;
 }


@@ -148,7 +150,7 @@ int wxPen::GetCap() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 

-    wxFAIL_MSG( _T("GetCap not implemented") );
+    wxFAIL_MSG( "GetCap not implemented" );

     return -1;
 }
 
     return -1;
 }
 


@@ -156,7 +158,7 @@ int wxPen::GetJoin() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
 

-    wxFAIL_MSG( _T("GetJoin not implemented") );
+    wxFAIL_MSG( "GetJoin not implemented" );

     return -1;
 }
 
     return -1;
 }
 


@@ -185,21 +187,16 @@ wxBitmap *wxPen::GetStipple() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
 
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
 

-    wxFAIL_MSG( _T("GetStipple not implemented") );
+    wxFAIL_MSG( "GetStipple not implemented" );

     return NULL;
 }
 
     return NULL;
 }
 

-bool wxPen::Ok() const
-{
-    return ((m_refData) && M_PENDATA->m_colour.Ok());
-}
-
-wxObjectRefData *wxPen::CreateRefData() const
+wxGDIRefData *wxPen::CreateGDIRefData() const

 {
     return new wxPenRefData;
 }
 
 {
     return new wxPenRefData;
 }
 

-wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }
 {
     return new wxPenRefData(*(wxPenRefData *)data);
 }