avoid bitmap distortion when a non standard bitmap size is used (replaces patch 1477883)

[wxWidgets.git] / src / gtk / notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index f95f03dce6d7a8e16558050d4806e78f57b55b6e..9c4b4a3932ff9a185f19c4c85cfc05f849c2eed1 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -692,7 +692,7 @@ bool wxNotebook::InsertPage( size_t position,
 
     /* set the label text */
 
 
     /* set the label text */
 

-    nb_page->m_text = text;
+    nb_page->m_text = wxStripMenuCodes(text);

     if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
 
     nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );
     if (nb_page->m_text.empty()) nb_page->m_text = wxEmptyString;
 
     nb_page->m_label = GTK_LABEL( gtk_label_new(wxGTK_CONV(nb_page->m_text)) );


@@ -804,7 +804,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
             wxPoint pos = GetPosition();
             rect.x -= pos.x;
             rect.y -= pos.y;
             wxPoint pos = GetPosition();
             rect.x -= pos.x;
             rect.y -= pos.y;

-            if ( rect.Inside( pt ) )
+            if ( rect.Contains( pt ) )

                 *flags |= wxBK_HITTEST_ONPAGE;
         }
     }
                 *flags |= wxBK_HITTEST_ONPAGE;
         }
     }