loop in wxInputStream::Read() while there is data to read

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 091dd483372e85360c8907abb31277cebf81d702..48925f342939f9bc11510704a7d7fc266c844262 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -394,7 +394,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
     unsigned char g = (unsigned char)(xcolour.green >> 8);
     unsigned char b = (unsigned char)(xcolour.blue >> 8);
 #endif
-    
+
     wxColour *col = new wxColour(r, g, b);
     Append(colour, col);
 
@@ -456,7 +456,6 @@ void wxInitializeStockObjects ()
 #if defined(__WXMAC__)
     int sizeFont = 12;
 
-    FontFamilyID fontId ;
     Str255 fontName ;
     SInt16 fontSize ;
     Style fontStyle ;
@@ -477,8 +476,8 @@ void wxInitializeStockObjects ()
   // Basic OS/2 has a fairly limited number of fonts and these are as good
   // as I can do to get something that looks halfway "wx" normal
   */
-  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */
-  wxSMALL_FONT = new wxFont (sizeFont - 4, wxMODERN, wxNORMAL, wxNORMAL); /* System VIO */
+  wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
+  wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
   wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
 #elif defined(__WXMAC__)