fixed crash on startup under GTK

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

diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp
index 959a6dc44df849f46048b754969647e1145c3eb4..cc3ae705aac3b8b9ade9a8d4e9f051849a3e7d89 100644 (file)
--- a/src/msw/pen.cpp
+++ b/src/msw/pen.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "pen.h"
 #endif
 
 #pragma implementation "pen.h"
 #endif
 


@@ -142,8 +142,7 @@ bool wxPen::RealizeResource()
            return TRUE;
        }
 
            return TRUE;
        }
 

-       COLORREF ms_colour = 0;
-       ms_colour = M_PENDATA->m_colour.GetPixel();
+       COLORREF 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
 
        // Join style, Cap style, Pen Stippling only on Win32.
        // Currently no time to find equivalent on Win3.1, sorry