Fix XTI compilation in STL build.

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 19d204f2e14db28cfb22d5e01da2b2caed6fa663..89e9dbbe4f480e5b571f4b4498260df2d19004be 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
 class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:

-    wxButton() { m_imageData = NULL; }
+    wxButton() { Init(); }

     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,


@@ -29,7 +29,7 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {

-        m_imageData = NULL;
+        Init();

 
         Create(parent, id, label, pos, size, style, validator, name);
     }
 
         Create(parent, id, label, pos, size, style, validator, name);
     }


@@ -63,9 +63,6 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 

-private:
-    void MakeOwnerDrawn();
-

 protected:
     // send a notification event, return true if processed
     bool SendClickEvent();
 protected:
     // send a notification event, return true if processed
     bool SendClickEvent();


@@ -80,15 +77,49 @@ protected:
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
 

+    virtual bool DoGetAuthNeeded() const;
+    virtual void DoSetAuthNeeded(bool show);

     virtual wxBitmap DoGetBitmap(State which) const;
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
     virtual wxBitmap DoGetBitmap(State which) const;
     virtual void DoSetBitmap(const wxBitmap& bitmap, State which);

+    virtual wxSize DoGetBitmapMargins() const;

     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
+    // non-NULL.
+    void AdjustForBitmapSize(wxSize& size) const;
+

     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;
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
+    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
+    // something not supported by the native control, such as using non default
+    // colours or a bitmap on pre-XP systems.
+    void MakeOwnerDrawn();
+
+    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);

 };
 
 #endif // _WX_BUTTON_H_
 };
 
 #endif // _WX_BUTTON_H_