No changes, just do wxButton fields initialization in Init() in wxMSW.

Add a helper function called from ctors and initialize m_imageData in it
instead of doing it in each ctor -- this will be more important when we add
more wxButton members.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 587e46e00432173f0600ec226e30c78f560461b3..14e1e708cd0590f86f8540a2b2dcabc84ede2285 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);
     }


@@ -97,6 +97,11 @@ protected:
     bool m_authNeeded;
 
 private:
     bool m_authNeeded;
 
 private:

+    void Init()
+    {
+        m_imageData = NULL;
+    }
+

     // 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.
     // 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.