X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90af251453884b7dab2a353280b9061a3ac02b5e..b082b52407e8132d04821bfaa31eb6a9a870b054:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 7b4bdfa542..1bf861d06a 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -131,7 +131,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
         w = size.x == -1 ? 0 : size.x,
         h = size.y == -1 ? 0 : size.y;
 
-    // ... and adjust it to account for ap ossible parent frames toolbar
+    // ... and adjust it to account for a possible parent frames toolbar
     AdjustForParentClientOrigin(x, y);
 
     m_hWnd = (WXHWND)::CreateWindowEx
@@ -168,7 +168,8 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 
     // set up fonts and colours
     InheritAttributes();
-    SetFont(GetDefaultAttributes().font);
+    if (!m_hasFont)
+        SetFont(GetDefaultAttributes().font);
 
     // set the size now if no initial size specified
     SetInitialBestSize(size);
@@ -249,7 +250,7 @@ bool wxControl::MSWOnNotify(int idCtrl,
                             WXLPARAM lParam,
                             WXLPARAM* result)
 {
-    wxEventType eventType = wxEVT_NULL;
+    wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL);
 
     NMHDR *hdr = (NMHDR*) lParam;
     switch ( hdr->code )