Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 75b4c135cd5744acb9c6db314d42a389d88302a2..6773264e022a35c1038fcf2889e4d995eee2c739 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univstatusbr.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -72,7 +68,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
     }
 
     SetFieldsCount(1);
     }
 
     SetFieldsCount(1);

-    
+

     CreateInputHandler(wxINP_HANDLER_STATUSBAR);
 
     SetSize(DoGetBestSize());
     CreateInputHandler(wxINP_HANDLER_STATUSBAR);
 
     SetSize(DoGetBestSize());


@@ -116,7 +112,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
     dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // do draw the fields
     dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // do draw the fields

-    int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED;
+    int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;

     for ( int n = 0; n < m_nFields; n++ )
     {
         rect.width = m_widthsAbs[n];
     for ( int n = 0; n < m_nFields; n++ )
     {
         rect.width = m_widthsAbs[n];


@@ -183,7 +179,7 @@ void wxStatusBarUniv::SetStatusText(const wxString& text, int number)
 
 wxString wxStatusBarUniv::GetStatusText(int number) const
 {
 
 wxString wxStatusBarUniv::GetStatusText(int number) const
 {

-    wxCHECK_MSG( number >= 0 && number < m_nFields, _T(""),
+    wxCHECK_MSG( number >= 0 && number < m_nFields, wxEmptyString,

                  _T("invalid status bar field index") );
 
     return m_statusText[number];
                  _T("invalid status bar field index") );
 
     return m_statusText[number];