Replaced /'s with \'s as BCC requires \'s for path names

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 12dd825ec721432409e90562b81f387709c2a7c8..e07b7a1e76b213017ee76d1a6d6464cf81ce80b8 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        pen.cpp
+// Name:        msw/pen.cpp

 // Purpose:     wxPen
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxPen
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -32,33 +32,42 @@
 #include "wx/msw/private.h"
 #include "assert.h"
 
 #include "wx/msw/private.h"
 #include "assert.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)

-#endif

 
 

-wxPenRefData::wxPenRefData(void)
+wxPenRefData::wxPenRefData()

 {
 {

-//  m_stipple = NULL ;

   m_style = wxSOLID;
   m_width = 1;
   m_join = wxJOIN_ROUND ;
   m_cap = wxCAP_ROUND ;
   m_nbDash = 0 ;
   m_style = wxSOLID;
   m_width = 1;
   m_join = wxJOIN_ROUND ;
   m_cap = wxCAP_ROUND ;
   m_nbDash = 0 ;

-  m_dash = 0 ;
+  m_dash = (wxMSWDash*)NULL;

   m_hPen = 0;
 }
 
   m_hPen = 0;
 }
 

-wxPenRefData::~wxPenRefData(void)
+wxPenRefData::wxPenRefData(const wxPenRefData& data)

 {
 {

-       if ( m_hPen )
-               ::DeleteObject((HPEN) m_hPen);
+    m_style = data.m_style;
+    m_width = data.m_width;
+    m_join = data.m_join;
+    m_cap = data.m_cap;
+    m_nbDash = data.m_nbDash;
+    m_dash = data.m_dash;
+    m_colour = data.m_colour;
+    m_hPen = 0;
+}
+
+wxPenRefData::~wxPenRefData()
+{
+        if ( m_hPen )
+                ::DeleteObject((HPEN) m_hPen);

 }
 
 // Pens
 
 }
 
 // Pens
 

-wxPen::wxPen(void)
+wxPen::wxPen()

 {
 {

-  if ( wxThePenList )
+  if (wxThePenList)

     wxThePenList->AddPen(this);
 }
 
     wxThePenList->AddPen(this);
 }
 


@@ -69,7 +78,7 @@ wxPen::~wxPen()
 }
 
 // Should implement Create
 }
 
 // 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;
 
 {
   m_refData = new wxPenRefData;
 


@@ -80,7 +89,7 @@ wxPen::wxPen(const wxColour& col, const int Width, const int Style)
   M_PENDATA->m_join = wxJOIN_ROUND ;
   M_PENDATA->m_cap = wxCAP_ROUND ;
   M_PENDATA->m_nbDash = 0 ;
   M_PENDATA->m_join = wxJOIN_ROUND ;
   M_PENDATA->m_cap = wxCAP_ROUND ;
   M_PENDATA->m_nbDash = 0 ;

-  M_PENDATA->m_dash = 0 ;
+  M_PENDATA->m_dash = (wxMSWDash*)NULL;

   M_PENDATA->m_hPen = 0 ;
 
 #ifndef __WIN32__
   M_PENDATA->m_hPen = 0 ;
 
 #ifndef __WIN32__


@@ -105,182 +114,188 @@ wxPen::wxPen(const wxColour& col, const int Width, const int Style)
         (Style == wxUSER_DASH))
       M_PENDATA->m_width = 1;
   }
         (Style == wxUSER_DASH))
       M_PENDATA->m_width = 1;
   }

-#endif 
+#endif

   RealizeResource();
 
   if ( wxThePenList )
     wxThePenList->AddPen(this);
 }
 
   RealizeResource();
 
   if ( wxThePenList )
     wxThePenList->AddPen(this);
 }
 

-wxPen::wxPen(const wxBitmap& stipple, const int Width)
+wxPen::wxPen(const wxBitmap& stipple, int Width)

 {
 {

-  m_refData = new wxPenRefData;
+    m_refData = new wxPenRefData;

 
 //  M_PENDATA->m_colour = col;
 
 //  M_PENDATA->m_colour = col;

-  M_PENDATA->m_stipple = stipple;
-  M_PENDATA->m_width = Width;
-  M_PENDATA->m_style = wxSTIPPLE;
-  M_PENDATA->m_join = wxJOIN_ROUND ;
-  M_PENDATA->m_cap = wxCAP_ROUND ;
-  M_PENDATA->m_nbDash = 0 ;
-  M_PENDATA->m_dash = 0 ;
-  M_PENDATA->m_hPen = 0 ;
-
-  RealizeResource();
-
-  if ( wxThePenList )
-    wxThePenList->AddPen(this);
-}
-
-wxPen::wxPen(const wxString& col, const int Width, const int Style)
-{
-  m_refData = new wxPenRefData;
-
-  M_PENDATA->m_colour = col;
-//  M_PENDATA->m_stipple = NULL ;
-  M_PENDATA->m_width = Width;
-  M_PENDATA->m_style = Style;
-  M_PENDATA->m_join = wxJOIN_ROUND ;
-  M_PENDATA->m_cap = wxCAP_ROUND ;
-  M_PENDATA->m_nbDash = 0 ;
-  M_PENDATA->m_dash = 0 ;
-  M_PENDATA->m_hPen = 0 ;
+    M_PENDATA->m_stipple = stipple;
+    M_PENDATA->m_width = Width;
+    M_PENDATA->m_style = wxSTIPPLE;
+    M_PENDATA->m_join = wxJOIN_ROUND ;
+    M_PENDATA->m_cap = wxCAP_ROUND ;
+    M_PENDATA->m_nbDash = 0 ;
+    M_PENDATA->m_dash = (wxMSWDash*)NULL;
+    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();
+    RealizeResource();

 
 

-  if ( wxThePenList )
-    wxThePenList->AddPen(this);
+    if (wxThePenList)
+       wxThePenList->AddPen(this);

 }
 
 }
 

-bool wxPen::RealizeResource(void)
+bool wxPen::RealizeResource()

 {
 {

-  if (M_PENDATA && (M_PENDATA->m_hPen == 0))
-  {
-    if (M_PENDATA->m_style==wxTRANSPARENT)
-    {
-      M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN);
-      return TRUE;
-    }
-
-    COLORREF ms_colour = 0 ;
-    ms_colour = M_PENDATA->m_colour.GetPixel() ;
-
-    // Join style, Cap style, Pen Stippling only on Win32.
-    // Currently no time to find equivalent on Win3.1, sorry
-    // [if such equiv exist!!]
-#ifdef __WIN32__
-    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_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour);
-    else
-    {
-      DWORD ms_style = PS_GEOMETRIC|wx2msPenStyle(M_PENDATA->m_style) ;
-
-      LOGBRUSH logb ;
-
-      switch(M_PENDATA->m_join)
-      {
-        case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL ; break ;
-        case wxJOIN_MITER: ms_style |= PS_JOIN_MITER ; break ;
-        default:
-        case wxJOIN_ROUND: ms_style |= PS_JOIN_ROUND ; break ;
-      }
-
-      switch(M_PENDATA->m_cap)
-      {
-        case wxCAP_PROJECTING: ms_style |= PS_ENDCAP_SQUARE ; break ;
-        case wxCAP_BUTT:       ms_style |= PS_ENDCAP_FLAT ;   break ;
-        default:
-        case wxCAP_ROUND:      ms_style |= PS_ENDCAP_ROUND ;  break ;
-      }
-
-      switch(M_PENDATA->m_style)
-      {
-        case wxSTIPPLE:
-          logb.lbStyle = BS_PATTERN ;
-          if (M_PENDATA->m_stipple.Ok())
-            logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP() ;
-          else
-            logb.lbHatch = (LONG)0 ;
-        break ;
-        case wxBDIAGONAL_HATCH:
-          logb.lbStyle = BS_HATCHED ;
-          logb.lbHatch = HS_BDIAGONAL ;
-        break ;
-        case wxCROSSDIAG_HATCH:
-          logb.lbStyle = BS_HATCHED ;
-          logb.lbHatch = HS_DIAGCROSS ;
-        break ;
-        case wxFDIAGONAL_HATCH:
-          logb.lbStyle = BS_HATCHED ;
-          logb.lbHatch = HS_FDIAGONAL ;
-        break ;
-        case wxCROSS_HATCH:
-          logb.lbStyle = BS_HATCHED ;
-          logb.lbHatch = HS_CROSS ;
-        break ;
-        case wxHORIZONTAL_HATCH:
-          logb.lbStyle = BS_HATCHED ;
-          logb.lbHatch = HS_HORIZONTAL ;
-        break ;
-        case wxVERTICAL_HATCH:
-          logb.lbStyle = BS_HATCHED ;
-          logb.lbHatch = HS_VERTICAL ;
-        break ;
-        default:
-          logb.lbStyle = BS_SOLID ;
-        break ;
-      }
-      logb.lbColor = ms_colour ;
-      wxDash *real_dash ;
-      if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
-      {
-        real_dash = new wxDash[M_PENDATA->m_nbDash] ;
-        int i;
-        for (i=0;i<M_PENDATA->m_nbDash;i++)
-          real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width ;
-      }
-      else
-        real_dash = 0 ;
-
-      // Win32s doesn't have ExtCreatePen function...
-      if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
-        M_PENDATA->m_hPen = (WXHPEN) ExtCreatePen(ms_style,M_PENDATA->m_width,&logb,
-                            M_PENDATA->m_style==wxUSER_DASH ? M_PENDATA->m_nbDash:0, (const DWORD *)real_dash);
-      else
-        M_PENDATA->m_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour);
-
-      if (real_dash)
-        delete [] real_dash ;
-    }
+   if (M_PENDATA && (M_PENDATA->m_hPen == 0))
+   {
+       if (M_PENDATA->m_style==wxTRANSPARENT)
+       {
+           M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN);
+           return TRUE;
+       }
+
+       COLORREF ms_colour = 0;
+       ms_colour = M_PENDATA->m_colour.GetPixel();
+
+       // Join style, Cap style, Pen Stippling only on Win32.
+       // Currently no time to find equivalent on Win3.1, sorry
+       // [if such equiv exist!!]
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+       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_width <= 1)
+       {
+           M_PENDATA->m_hPen =
+             (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+                                 M_PENDATA->m_width,
+                                 ms_colour );
+       }
+       else
+       {
+           DWORD ms_style = PS_GEOMETRIC | wx2msPenStyle(M_PENDATA->m_style);
+
+           switch(M_PENDATA->m_join)
+           {
+               case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL; break;
+               case wxJOIN_MITER: ms_style |= PS_JOIN_MITER; break;
+               default:
+               case wxJOIN_ROUND: ms_style |= PS_JOIN_ROUND; break;
+           }
+
+           switch(M_PENDATA->m_cap)
+           {
+               case wxCAP_PROJECTING: ms_style |= PS_ENDCAP_SQUARE;  break;
+               case wxCAP_BUTT:       ms_style |= PS_ENDCAP_FLAT;    break;
+               default:
+               case wxCAP_ROUND:      ms_style |= PS_ENDCAP_ROUND;   break;
+           }
+
+           LOGBRUSH logb;
+
+           switch(M_PENDATA->m_style)
+           {
+               case wxSTIPPLE:
+                   logb.lbStyle = BS_PATTERN ;
+                   if (M_PENDATA->m_stipple.Ok())
+                       logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP();
+                   else
+                       logb.lbHatch = (LONG)0;
+                   break;
+               case wxBDIAGONAL_HATCH:
+                   logb.lbStyle = BS_HATCHED;
+                   logb.lbHatch = HS_BDIAGONAL;
+                   break;
+               case wxCROSSDIAG_HATCH:
+                   logb.lbStyle = BS_HATCHED;
+                   logb.lbHatch = HS_DIAGCROSS;
+                   break;
+               case wxFDIAGONAL_HATCH:
+                   logb.lbStyle = BS_HATCHED;
+                   logb.lbHatch = HS_FDIAGONAL;
+                   break;
+               case wxCROSS_HATCH:
+                   logb.lbStyle = BS_HATCHED;
+                   logb.lbHatch = HS_CROSS;
+                   break;
+               case wxHORIZONTAL_HATCH:
+                   logb.lbStyle = BS_HATCHED;
+                   logb.lbHatch = HS_HORIZONTAL;
+                   break;
+               case wxVERTICAL_HATCH:
+                   logb.lbStyle = BS_HATCHED;
+                   logb.lbHatch = HS_VERTICAL;
+                   break;
+               default:
+                   logb.lbStyle = BS_SOLID;
+#ifdef __WXDEBUG__
+                   // this should be unnecessary (it's unused) but suppresses the Purigy
+                   // messages about uninitialized memory read
+                   logb.lbHatch = 0;
+#endif
+                   break;
+           }
+
+           logb.lbColor = ms_colour;
+
+           wxMSWDash *real_dash;
+           if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
+           {
+               real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
+               int i;
+               for (i=0; i<M_PENDATA->m_nbDash; i++)
+                   real_dash[i] = M_PENDATA->m_dash[i] * M_PENDATA->m_width;
+           }
+           else
+           {
+               real_dash = (wxMSWDash*)NULL;
+           }
+
+           // Win32s doesn't have ExtCreatePen function...
+           if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
+           {
+               M_PENDATA->m_hPen =
+                 (WXHPEN) ExtCreatePen( ms_style,
+                                        M_PENDATA->m_width,
+                                        &logb,
+                                        M_PENDATA->m_style == wxUSER_DASH
+                                          ? M_PENDATA->m_nbDash
+                                          : 0,
+                                        (LPDWORD)real_dash );
+           }
+           else
+           {
+               M_PENDATA->m_hPen =
+                  (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+                                      M_PENDATA->m_width,
+                                      ms_colour );
+           }
+
+           if (real_dash)
+               delete [] real_dash;
+       }

 #else
 #else

-    M_PENDATA->m_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour);
+       M_PENDATA->m_hPen =
+         (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+                             M_PENDATA->m_width,
+                             ms_colour );

 #endif
 #endif

-#ifdef DEBUG_CREATE
-    if (M_PENDATA->m_hPen==0)
-      wxError("Cannot create pen","Internal error") ;
+#ifdef WXDEBUG_CREATE
+       if (M_PENDATA->m_hPen==0)
+           wxError("Cannot create pen","Internal error") ;

 #endif
 #endif

-    return TRUE;
-  }
-  return FALSE;
+       return TRUE;
+    }
+    return FALSE;

 }
 
 }
 

-WXHANDLE wxPen::GetResourceHandle(void)
+WXHANDLE wxPen::GetResourceHandle()

 {
 {

-       if ( !M_PENDATA )
-               return 0;
-       else
-               return (WXHANDLE)M_PENDATA->m_hPen;
+        if ( !M_PENDATA )
+                return 0;
+        else
+                return (WXHANDLE)M_PENDATA->m_hPen;

 }
 
 }
 

-bool wxPen::FreeResource(bool force)
+bool wxPen::FreeResource(bool WXUNUSED(force))

 {
   if (M_PENDATA && (M_PENDATA->m_hPen != 0))
   {
 {
   if (M_PENDATA && (M_PENDATA->m_hPen != 0))
   {


@@ -291,167 +306,142 @@ bool wxPen::FreeResource(bool force)
   else return FALSE;
 }
 
   else return FALSE;
 }
 

-/*
-bool wxPen::UseResource(void)
-{
-  IncrementResourceUsage();
-  return TRUE;
-}
-
-bool wxPen::ReleaseResource(void)
+bool wxPen::IsFree() const

 {
 {

-  DecrementResourceUsage();
-  return TRUE;
+  return (M_PENDATA && M_PENDATA->m_hPen == 0);

 }
 }

-*/

 
 

-bool wxPen::IsFree(void)
+void wxPen::Unshare()

 {
 {

-  return (M_PENDATA && M_PENDATA->m_hPen == 0);
+        // Don't change shared data
+        if (!m_refData)
+    {
+                m_refData = new wxPenRefData();
+        }
+    else
+    {
+                wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+                UnRef();
+                m_refData = ref;
+        }

 }
 
 void wxPen::SetColour(const wxColour& col)
 {
 }
 
 void wxPen::SetColour(const wxColour& col)
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
-
-  M_PENDATA->m_colour = col;
-  
-  if (FreeResource())
-    RealizeResource();
-}
+    Unshare();

 
 

-void wxPen::SetColour(const wxString& col)
-{
-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    M_PENDATA->m_colour = col;

 
 

-  M_PENDATA->m_colour = col;
-  
-  if (FreeResource())

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    Unshare();
+
+    M_PENDATA->m_colour.Set(r, g, b);

 
 

-  M_PENDATA->m_colour.Set(r, g, b);
-  
-  if (FreeResource())

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetWidth(const int Width)
+void wxPen::SetWidth(int Width)

 {
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    Unshare();

 
 

-  M_PENDATA->m_width = Width;
+    M_PENDATA->m_width = Width;

 
 

-  if (FreeResource())

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetStyle(const int Style)
+void wxPen::SetStyle(int Style)

 {
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    Unshare();

 
 

-  M_PENDATA->m_style = Style;
+    M_PENDATA->m_style = Style;

 
 

-  if (FreeResource())

     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {
     RealizeResource();
 }
 
 void wxPen::SetStipple(const wxBitmap& Stipple)
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    Unshare();
+
+    M_PENDATA->m_stipple = Stipple;
+    M_PENDATA->m_style = wxSTIPPLE;

 
 

-  M_PENDATA->m_stipple = Stipple;
-  M_PENDATA->m_style = wxSTIPPLE;
-  
-  if (FreeResource())

     RealizeResource();
 }
 
     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;
+    Unshare();
+
+    M_PENDATA->m_nbDash = nb_dashes;
+    M_PENDATA->m_dash = (wxMSWDash *)Dash;

 
 

-  M_PENDATA->m_nbDash = nb_dashes;
-  M_PENDATA->m_dash = (wxDash *)Dash;
-  
-  if (FreeResource())

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetJoin(const int Join)
+void wxPen::SetJoin(int Join)

 {
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    Unshare();

 
 

-  M_PENDATA->m_join = Join;
+    M_PENDATA->m_join = Join;

 
 

-  if (FreeResource())

     RealizeResource();
 }
 
     RealizeResource();
 }
 

-void wxPen::SetCap(const int Cap)
+void wxPen::SetCap(int Cap)

 {
 {

-  if ( !M_PENDATA )
-       m_refData = new wxPenRefData;
+    Unshare();

 
 

-  M_PENDATA->m_cap = Cap;
+    M_PENDATA->m_cap = Cap;

 
 

-  if (FreeResource())

     RealizeResource();
 }
 
 int wx2msPenStyle(int wx_style)
 {
     RealizeResource();
 }
 
 int wx2msPenStyle(int wx_style)
 {

-  int cstyle;
-/***
-#ifdef __WIN32__
-  DWORD vers = GetVersion() ;
-  WORD  high = HIWORD(vers) ; // high bit=0 for NT, 1 for Win32s
+    int cstyle;
+    switch (wx_style)
+    {
+#if !defined(__WXMICROWIN__)
+       case wxDOT:
+           cstyle = PS_DOT;
+           break;
+
+       case wxDOT_DASH:
+           cstyle = PS_DASHDOT;
+           break;
+
+       case wxSHORT_DASH:
+       case wxLONG_DASH:
+           cstyle = PS_DASH;
+           break;
+
+       case wxTRANSPARENT:
+           cstyle = PS_NULL;
+           break;

 #endif
 #endif

-***/
-  switch (wx_style)
-  {
-    case wxDOT:
-      cstyle = PS_DOT;
-      break;
-    case wxSHORT_DASH:
-    case wxLONG_DASH:
-      cstyle = PS_DASH;
-      break;
-    case wxTRANSPARENT:
-      cstyle = PS_NULL;
-      break;
-    case wxUSER_DASH:
-      // User dash style not supported on Win3.1, sorry...
+
+       case wxUSER_DASH:
+#if !defined(__WXMICROWIN__)

 #ifdef __WIN32__
 #ifdef __WIN32__

-      // Win32s doesn't have PS_USERSTYLE
-/***
-      if ((high&0x8000)==0)
-***/
-      if (wxGetOsVersion()==wxWINDOWS_NT)
-        cstyle = PS_USERSTYLE ;
-      else
-        cstyle = PS_DOT ; // We must make a choice... This is mine!
+           // Win32s doesn't have PS_USERSTYLE
+           if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
+               cstyle = PS_USERSTYLE;
+           else
+               cstyle = PS_DOT; // We must make a choice... This is mine!

 #else
 #else

-      cstyle = PS_DASH ;
+           cstyle = PS_DASH;

 #endif
 #endif

-      break ;
-    case wxSOLID:
-    default:
-      cstyle = PS_SOLID;
-      break;
-  }
-  return cstyle;
+#endif
+           break;
+       case wxSOLID:
+       default:
+           cstyle = PS_SOLID;
+           break;
+   }
+   return cstyle;

 }
 
 }