Compilation fixes.

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 439a6b618c5d9a43d66ddd57bf31e19126efe7fd..3e8dc6024c1a0836e24bdc8d2ae19d92eeeb82f8 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -80,18 +80,20 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
   if ( !wxWindow::Create(parent, id,
                          wxDefaultPosition, wxDefaultSize,
                          style | wxTAB_TRAVERSAL, name) )
   if ( !wxWindow::Create(parent, id,
                          wxDefaultPosition, wxDefaultSize,
                          style | wxTAB_TRAVERSAL, name) )

-      return FALSE;
+      return false;

 
   // The status bar should have a themed background
 
   // The status bar should have a themed background

-  SetThemeEnabled( TRUE );
+  SetThemeEnabled( true );

 
   // Don't wish this to be found as a child
 #ifndef __WXMAC__
   parent->GetChildren().DeleteObject(this);
 #endif
   InitColours();
 
   // Don't wish this to be found as a child
 #ifndef __WXMAC__
   parent->GetChildren().DeleteObject(this);
 #endif
   InitColours();

-
-  SetFont(m_defaultStatusBarFont);
+  
+#ifdef __WXPM__
+  SetFont(*wxSMALL_FONT);
+#endif

 
   // Set the height according to the font and the border size
   wxClientDC dc(this);
 
   // Set the height according to the font and the border size
   wxClientDC dc(this);


@@ -102,11 +104,11 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 

-  SetSize(-1, -1, -1, height);
+  SetSize(wxDefaultPosition.x, wxDefaultPosition.y, wxDefaultSize.x, height);

 
   SetFieldsCount(1);
 
 
   SetFieldsCount(1);
 

-  return TRUE;
+  return true;

 }
 
 
 }
 
 


@@ -125,7 +127,7 @@ wxSize wxStatusBarGeneric::DoGetBestSize() const
     height = (int)( (11*y)/10 + 2*GetBorderY());
 
     return wxSize(width, height);
     height = (int)( (11*y)/10 + 2*GetBorderY());
 
     return wxSize(width, height);

-}    
+}

 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {
 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {


@@ -159,7 +161,7 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
         wxRect rect;
         GetFieldRect(number, rect);
 
         wxRect rect;
         GetFieldRect(number, rect);
 

-        Refresh( TRUE, &rect );
+        Refresh( true, &rect );

     }
 }
 
     }
 }
 


@@ -311,7 +313,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
   // Get the position and size of the field's internal bounding rectangle
 bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 {
   // Get the position and size of the field's internal bounding rectangle
 bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 {

-    wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE,
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), false,

                  _T("invalid status bar field index") );
 
     // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)
                  _T("invalid status bar field index") );
 
     // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)


@@ -345,7 +347,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
     rect.width = m_widthsAbs[n] - 2*m_borderX;
     rect.height = height - 2*m_borderY;
 
     rect.width = m_widthsAbs[n] - 2*m_borderX;
     rect.height = height - 2*m_borderY;
 

-    return TRUE;
+    return true;

 }
 
 // Initialize colours
 }
 
 // Initialize colours


@@ -368,23 +370,16 @@ void wxStatusBarGeneric::InitColours()
     SetBackgroundColour(vColour);
     vColour.Set(wxString("BLACK"));
     SetForegroundColour(vColour);
     SetBackgroundColour(vColour);
     vColour.Set(wxString("BLACK"));
     SetForegroundColour(vColour);

-    m_defaultStatusBarFont = *wxSMALL_FONT;

 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif
 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif

-
-#ifndef __WXPM__
-    m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-#endif

 }
 
 // Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();

-    Refresh();

 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);


@@ -400,7 +395,7 @@ void wxStatusBarGeneric::SetMinHeight(int height)
 
     if ( height > (11*y)/10 )
     {
 
     if ( height > (11*y)/10 )
     {

-        SetSize(-1, -1, -1, height + 2*m_borderY);
+        SetSize(wxDefaultPosition.x, wxDefaultPosition.y, wxDefaultSize.x, height + 2*m_borderY);

     }
 }
 
     }
 }
 


@@ -432,10 +427,10 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
     }
     else
     {
     }
     else
     {

-        event.Skip( TRUE );
+        event.Skip( true );

     }
 #else
     }
 #else

-    event.Skip( TRUE );
+    event.Skip( true );

 #endif
 }
 
 #endif
 }
 


@@ -466,10 +461,10 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
     }
     else
     {
     }
     else
     {

-        event.Skip( TRUE );
+        event.Skip( true );

     }
 #else
     }
 #else

-    event.Skip( TRUE );
+    event.Skip( true );

 #endif
 }
 
 #endif
 }