Fix the comparison function in the list control sample to do what it says.

[wxWidgets.git] / include / wx / msw / button.h

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 14e1e708cd0590f86f8540a2b2dcabc84ede2285..89e9dbbe4f480e5b571f4b4498260df2d19004be 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -85,6 +85,10 @@ protected:
     virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
     virtual void DoSetBitmapPosition(wxDirection dir);
 
     virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
     virtual void DoSetBitmapPosition(wxDirection dir);
 

+#if wxUSE_MARKUP
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP
+

     // Increases the passed in size to account for the button image.
     //
     // Should only be called if we do have a button, i.e. if m_imageData is
     // Increases the passed in size to account for the button image.
     //
     // Should only be called if we do have a button, i.e. if m_imageData is


@@ -93,6 +97,10 @@ protected:
 
     class wxButtonImageData *m_imageData;
 
 
     class wxButtonImageData *m_imageData;
 

+#if wxUSE_MARKUP
+    class wxMarkupText *m_markupText;
+#endif // wxUSE_MARKUP
+

     // true if the UAC symbol is shown
     bool m_authNeeded;
 
     // true if the UAC symbol is shown
     bool m_authNeeded;
 


@@ -100,6 +108,10 @@ private:
     void Init()
     {
         m_imageData = NULL;
     void Init()
     {
         m_imageData = NULL;

+#if wxUSE_MARKUP
+        m_markupText = NULL;
+#endif // wxUSE_MARKUP
+        m_authNeeded = false;

     }
 
     // Switches button into owner-drawn mode: this is used if we need to draw
     }
 
     // Switches button into owner-drawn mode: this is used if we need to draw