WinCE doesn't have GetMessageTime

[wxWidgets.git] / src / msw / tbar95.cpp

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 7276787ba478f59d4f6de15392da4278d90eaf51..263ff804adfcd5ae6700c8697287c21bb96d006f 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "tbar95.h"
 #endif
 
     #pragma implementation "tbar95.h"
 #endif
 


@@ -109,6 +109,25 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
 
 
 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)
 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 ) \
 {
     // 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);
     if ( wxTheApp->GetComCtl32Version() >= 470 )
     {
         DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);