many fixes to wxTextCrtl, wxTreeCrtl, wxListBox,

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 12dd825ec721432409e90562b81f387709c2a7c8..2818565949a09f013c83bbae49570bedec5c9fef 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -69,7 +69,7 @@ wxPen::~wxPen()
 }
 
 // Should implement Create
-wxPen::wxPen(const wxColour& col, const int Width, const int Style)
+wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
   m_refData = new wxPenRefData;
 
@@ -112,7 +112,7 @@ wxPen::wxPen(const wxColour& col, const int Width, const int Style)
     wxThePenList->AddPen(this);
 }
 
-wxPen::wxPen(const wxBitmap& stipple, const int Width)
+wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
   m_refData = new wxPenRefData;
 
@@ -132,7 +132,7 @@ wxPen::wxPen(const wxBitmap& stipple, const int Width)
     wxThePenList->AddPen(this);
 }
 
-wxPen::wxPen(const wxString& col, const int Width, const int Style)
+wxPen::wxPen(const wxString& col, int Width, int Style)
 {
   m_refData = new wxPenRefData;
 
@@ -146,10 +146,6 @@ wxPen::wxPen(const wxString& col, const int Width, const int Style)
   M_PENDATA->m_dash = 0 ;
   M_PENDATA->m_hPen = 0 ;
 
-  // In Windows, only a pen of width = 1 can be dotted or dashed!
-  if ((Style == wxDOT) || (Style == wxLONG_DASH) || (Style == wxSHORT_DASH) || (Style == wxDOT_DASH))
-    M_PENDATA->m_width = 1;
-    
   RealizeResource();
 
   if ( wxThePenList )
@@ -176,7 +172,8 @@ bool wxPen::RealizeResource(void)
     if (M_PENDATA->m_join==wxJOIN_ROUND        &&
         M_PENDATA->m_cap==wxCAP_ROUND          &&
         M_PENDATA->m_style!=wxUSER_DASH        &&
-        M_PENDATA->m_style!=wxSTIPPLE
+        M_PENDATA->m_style!=wxSTIPPLE          &&
+        M_PENDATA->m_width <= 1
        )
       M_PENDATA->m_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour);
     else
@@ -263,7 +260,7 @@ bool wxPen::RealizeResource(void)
 #else
     M_PENDATA->m_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour);
 #endif
-#ifdef DEBUG_CREATE
+#ifdef WXDEBUG_CREATE
     if (M_PENDATA->m_hPen==0)
       wxError("Cannot create pen","Internal error") ;
 #endif
@@ -343,7 +340,7 @@ void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsign
     RealizeResource();
 }
 
-void wxPen::SetWidth(const int Width)
+void wxPen::SetWidth(int Width)
 {
   if ( !M_PENDATA )
        m_refData = new wxPenRefData;
@@ -354,7 +351,7 @@ void wxPen::SetWidth(const int Width)
     RealizeResource();
 }
 
-void wxPen::SetStyle(const int Style)
+void wxPen::SetStyle(int Style)
 {
   if ( !M_PENDATA )
        m_refData = new wxPenRefData;
@@ -377,7 +374,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
     RealizeResource();
 }
 
-void wxPen::SetDashes(const int nb_dashes, const wxDash *Dash)
+void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
   if ( !M_PENDATA )
        m_refData = new wxPenRefData;
@@ -389,7 +386,7 @@ void wxPen::SetDashes(const int nb_dashes, const wxDash *Dash)
     RealizeResource();
 }
 
-void wxPen::SetJoin(const int Join)
+void wxPen::SetJoin(int Join)
 {
   if ( !M_PENDATA )
        m_refData = new wxPenRefData;
@@ -400,7 +397,7 @@ void wxPen::SetJoin(const int Join)
     RealizeResource();
 }
 
-void wxPen::SetCap(const int Cap)
+void wxPen::SetCap(int Cap)
 {
   if ( !M_PENDATA )
        m_refData = new wxPenRefData;