X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..549c6f67f9181e3ad8abfffa8c0c6cdd7ec49e5a:/src/msw/tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index aef9105c82..51c70e7556 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -32,15 +32,17 @@
 
 #include <windows.h>
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/tbar95.h"
@@ -99,6 +101,8 @@ bool wxToolBar95::Create(wxWindow *parent,
                          long style,
                          const wxString& name)
 {
+  m_hWnd = 0;
+
   m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
                                 GetGValue(GetSysColor(COLOR_BTNFACE)),
                                 GetBValue(GetSysColor(COLOR_BTNFACE)));
@@ -252,7 +256,9 @@ bool wxToolBar95::CreateTools()
     replaceBitmap.nIDNew = (UINT) (HBITMAP) m_hBitmap;
     replaceBitmap.nButtons = noButtons;
     if (::SendMessage((HWND) GetHWND(), TB_REPLACEBITMAP, (WPARAM) 0, (LPARAM) &replaceBitmap) == -1)
+    {
       wxFAIL_MSG(_T("Could not add bitmap to toolbar"));
+    }
 
     ::DeleteObject((HBITMAP) oldToolBarBitmap);
 
@@ -271,7 +277,9 @@ bool wxToolBar95::CreateTools()
     addBitmap.hInst = 0;
     addBitmap.nID = (UINT)m_hBitmap;
     if (::SendMessage((HWND) GetHWND(), TB_ADDBITMAP, (WPARAM) noButtons, (LPARAM) &addBitmap) == -1)
+    {
       wxFAIL_MSG(_T("Could not add bitmap to toolbar"));
+    }
   }
 
   // Now add the buttons.