X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbd41262ca725f7f9d7045f381dc1705fba06a39..7ba166dd9e0df474d1cd56cd5ffa89d67488ee19:/src/msw/pen.cpp?ds=sidebyside

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 9b3d3e4f98..e07b7a1e76 100644
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -157,7 +157,7 @@ bool wxPen::RealizeResource()
        // 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 defined(__WIN32__) && !defined(__WXMICROWIN__)
        if (M_PENDATA->m_join==wxJOIN_ROUND        &&
            M_PENDATA->m_cap==wxCAP_ROUND          &&
            M_PENDATA->m_style!=wxUSER_DASH        &&
@@ -295,7 +295,7 @@ WXHANDLE wxPen::GetResourceHandle()
                 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))
   {
@@ -405,6 +405,7 @@ int wx2msPenStyle(int wx_style)
     int cstyle;
     switch (wx_style)
     {
+#if !defined(__WXMICROWIN__)
        case wxDOT:
            cstyle = PS_DOT;
            break;
@@ -421,8 +422,10 @@ int wx2msPenStyle(int wx_style)
        case wxTRANSPARENT:
            cstyle = PS_NULL;
            break;
+#endif
 
        case wxUSER_DASH:
+#if !defined(__WXMICROWIN__)
 #ifdef __WIN32__
            // Win32s doesn't have PS_USERSTYLE
            if (wxGetOsVersion()==wxWINDOWS_NT || wxGetOsVersion()==wxWIN95)
@@ -431,6 +434,7 @@ int wx2msPenStyle(int wx_style)
                cstyle = PS_DOT; // We must make a choice... This is mine!
 #else
            cstyle = PS_DASH;
+#endif
 #endif
            break;
        case wxSOLID: