X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d236fd0faa89b4c3da04facdd50817f03207093..d0e278d98e9ecc0f78943a662fca855811f3bea7:/src/msw/tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7276787ba4..263ff804ad 100644
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "tbar95.h"
 #endif
 
@@ -109,6 +109,25 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
+/*
+	TOOLBAR PROPERTIES
+		tool
+			bitmap
+			bitmap2
+			tooltip
+			longhelp
+			radio (bool)
+			toggle (bool)
+		separator
+		style ( wxNO_BORDER | wxTB_HORIZONTAL)
+		bitmapsize
+		margins
+		packing
+		separation
+
+		dontattachtoframe
+*/
+
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
     EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
@@ -990,7 +1009,8 @@ wxSize wxToolBar::GetToolSize() const
 {
     // TB_GETBUTTONSIZE is supported from version 4.70
 #if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
-    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) )
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !defined (__DIGITALMARS__)
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);