Revert MSW window classes uniquification patch.

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

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index 663c7f6505832cdea40f10d4bc266f3f2ed453a9..a7031f4f5195e8b1171fd6537d4426b0cc1d02f7 100644 (file)
--- a/src/msw/statusbar.cpp
+++ b/src/msw/statusbar.cpp
@@ -104,6 +104,12 @@ bool wxStatusBar::Create(wxWindow *parent,
     if ( style & wxCLIP_SIBLINGS )
         wstyle |= WS_CLIPSIBLINGS;
 
     if ( style & wxCLIP_SIBLINGS )
         wstyle |= WS_CLIPSIBLINGS;
 

+    // wxSTB_SIZEGRIP is part of our default style but it doesn't make sense to
+    // show size grip if this is the status bar of a non-resizeable TLW so turn
+    // it off in such case
+    if ( parent->IsTopLevel() && !parent->HasFlag(wxRESIZE_BORDER) )
+        style &= ~wxSTB_SIZEGRIP;
+

     // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
     // (at least in the version of comctl32.dll I'm using), and the only way to
     // turn it off is to use CCS_TOP style - as we position the status bar
     // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
     // (at least in the version of comctl32.dll I'm using), and the only way to
     // turn it off is to use CCS_TOP style - as we position the status bar


@@ -173,11 +179,7 @@ wxStatusBar::~wxStatusBar()
     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {

-        if (m_tooltips[i])
-        {
-            delete m_tooltips[i];
-            m_tooltips[i] = NULL;
-        }
+        wxDELETE(m_tooltips[i]);

     }
 
     wxDELETE(m_pDC);
     }
 
     wxDELETE(m_pDC);


@@ -206,11 +208,7 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {

-        if (m_tooltips[i])
-        {
-            delete m_tooltips[i];
-            m_tooltips[i] = NULL;
-        }
+        wxDELETE(m_tooltips[i]);

     }
 
     // shrink/expand the array:
     }
 
     // shrink/expand the array:


@@ -316,7 +314,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
                                      *m_pDC,
                                      ellmode,
                                      maxWidth,
                                      *m_pDC,
                                      ellmode,
                                      maxWidth,

-                                     wxELLIPSIZE_EXPAND_TAB);
+                                     wxELLIPSIZE_FLAGS_EXPAND_TABS);

 
         // update the ellipsization status for this pane; this is used later to
         // decide whether a tooltip should be shown or not for this pane
 
         // update the ellipsization status for this pane; this is used later to
         // decide whether a tooltip should be shown or not for this pane


@@ -348,8 +346,7 @@ void wxStatusBar::DoUpdateStatusText(int nField)
             else
             {
                 // delete the tooltip associated with this pane; it's not needed anymore
             else
             {
                 // delete the tooltip associated with this pane; it's not needed anymore

-                delete m_tooltips[nField];
-                m_tooltips[nField] = NULL;
+                wxDELETE(m_tooltips[nField]);

             }
         }
         else
             }
         }
         else