gtk_signal_connect -> g_signal_connect in unix/mediactrl.cpp

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index db33952a08b12f45060484a1f76a0af375dc23eb..e294b18078a9be29c7f198b4dc3e40ccc8a202a1 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        generic/statusbr.cpp
+// Name:        src/generic/statusbr.cpp

 // Purpose:     wxStatusBarGeneric class implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStatusBarGeneric class implementation
 // Author:      Julian Smart
 // Modified by:


@@ -19,7 +19,6 @@
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"

 #include "wx/frame.h"
 #include "wx/settings.h"
 #include "wx/dcclient.h"
 #include "wx/frame.h"
 #include "wx/settings.h"
 #include "wx/dcclient.h"


@@ -351,7 +350,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 void wxStatusBarGeneric::InitColours()
 {
     // Shadow colours
 void wxStatusBarGeneric::InitColours()
 {
     // Shadow colours

-#if defined(__WIN95__) || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXMAC__)

     wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
 
     wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);