Also redirect wxEVT_KEY_UP and wxEVT_CHAR from the embedded wxTextCtrl

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

diff --git a/src/common/fontcmn.cpp b/src/common/fontcmn.cpp
index 5ac8cce15e6eb60094e002b139301d9b847b2525..a5ff16a10fef310b384d9394ebf549589f2b3210 100644 (file)
--- a/src/common/fontcmn.cpp
+++ b/src/common/fontcmn.cpp
@@ -55,7 +55,6 @@
 
 static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
 {
 
 static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
 {

-    int currentSize = 0;

     int largestGood = 0;
     int smallestBad = 0;
 
     int largestGood = 0;
     int smallestBad = 0;
 


@@ -64,7 +63,7 @@ static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
 
     // NB: this assignment was separated from the variable definition
     // in order to fix a gcc v3.3.3 compiler crash
 
     // NB: this assignment was separated from the variable definition
     // in order to fix a gcc v3.3.3 compiler crash

-    currentSize = font.GetPointSize();
+    int currentSize = font.GetPointSize();

     while (currentSize > 0)
     {
         dc.SetFont(font);
     while (currentSize > 0)
     {
         dc.SetFont(font);


@@ -131,9 +130,9 @@ wxFontBase::~wxFontBase()
 
 /* static */
 wxFont *wxFontBase::New(int size,
 
 /* static */
 wxFont *wxFontBase::New(int size,

-                        int family,
-                        int style,
-                        int weight,
+                        wxFontFamily family,
+                        wxFontStyle style,
+                        wxFontWeight weight,

                         bool underlined,
                         const wxString& face,
                         wxFontEncoding encoding)
                         bool underlined,
                         const wxString& face,
                         wxFontEncoding encoding)


@@ -177,9 +176,9 @@ wxFont *wxFontBase::New(int pointSize,
 
 /* static */
 wxFont *wxFontBase::New(const wxSize& pixelSize,
 
 /* static */
 wxFont *wxFontBase::New(const wxSize& pixelSize,

-                        int family,
-                        int style,
-                        int weight,
+                        wxFontFamily family,
+                        wxFontStyle style,
+                        wxFontWeight weight,

                         bool underlined,
                         const wxString& face,
                         wxFontEncoding encoding)
                         bool underlined,
                         const wxString& face,
                         wxFontEncoding encoding)