From 49ed30caae8573e2bea613b50610811da1ca45c8 Mon Sep 17 00:00:00 2001
From: Bryan Petty <bryan@ibaku.net>
Date: Wed, 10 Sep 2014 14:57:50 +0000
Subject: [PATCH] Use the usual WXHWND instead of wxWidget.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/taskbarbutton.h |  4 ++--
 include/wx/taskbarbutton.h     |  3 +--
 src/msw/frame.cpp              |  2 +-
 src/msw/gauge.cpp              |  2 +-
 src/msw/taskbarbutton.cpp      | 11 +++++------
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/include/wx/msw/taskbarbutton.h b/include/wx/msw/taskbarbutton.h
index 68bf08f083..0535d74941 100644
--- a/include/wx/msw/taskbarbutton.h
+++ b/include/wx/msw/taskbarbutton.h
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxITaskbarList3;
 class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton
 {
 public:
-    wxTaskBarButtonImpl(WXWidget parent);
+    wxTaskBarButtonImpl(wxWindow* parent);
     virtual ~wxTaskBarButtonImpl();
 
     virtual void SetProgressRange(int range) wxOVERRIDE;
@@ -47,7 +47,7 @@ public:
     bool InitOrUpdateThumbBarButtons();
 
 private:
-    WXWidget m_hwnd;
+    WXHWND m_hwnd;
     wxITaskbarList3 *m_taskbarList;
 
     typedef wxVector<wxThumbBarButton*> wxThumbBarButtons;
diff --git a/include/wx/taskbarbutton.h b/include/wx/taskbarbutton.h
index 25912faa92..6d612f1a0e 100644
--- a/include/wx/taskbarbutton.h
+++ b/include/wx/taskbarbutton.h
@@ -134,7 +134,7 @@ private:
 class WXDLLIMPEXP_CORE wxAppProgressIndicator
 {
 public:
-    wxAppProgressIndicator(WXWidget parent, int maxValue);
+    wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100);
     virtual ~wxAppProgressIndicator();
     void SetValue(int value);
     void SetRange(int range);
@@ -142,7 +142,6 @@ public:
     void Reset();
 
 private:
-    WXWidget m_parent;
     int m_maxValue;
     wxTaskBarButton* m_taskBarButton;
 
diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 1f2f2d49c2..af928e4536 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -994,7 +994,7 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
 #if wxUSE_TASKBARBUTTON
     if ( message == wxMsgTaskbarButtonCreated )
     {
-        m_taskBarButton = new wxTaskBarButtonImpl(GetHandle());
+        m_taskBarButton = new wxTaskBarButtonImpl(this);
         processed = true;
     }
 #endif
diff --git a/src/msw/gauge.cpp b/src/msw/gauge.cpp
index 204920ba69..c4bef3d943 100644
--- a/src/msw/gauge.cpp
+++ b/src/msw/gauge.cpp
@@ -103,7 +103,7 @@ bool wxGauge::Create(wxWindow *parent,
         if ( topParent != NULL )
         {
             m_appProgressIndicator =
-                new wxAppProgressIndicator(topParent->GetHandle(), range);
+                new wxAppProgressIndicator(topParent, range);
         }
     }
 #endif
diff --git a/src/msw/taskbarbutton.cpp b/src/msw/taskbarbutton.cpp
index bbd41003cf..5369f6f5c6 100644
--- a/src/msw/taskbarbutton.cpp
+++ b/src/msw/taskbarbutton.cpp
@@ -696,8 +696,8 @@ bool wxThumbBarButton::UpdateParentTaskBarButton()
 // ----------------------------------------------------------------------------
 // wxTaskBarButtonImpl Implementation.
 // ----------------------------------------------------------------------------
-wxTaskBarButtonImpl::wxTaskBarButtonImpl(WXWidget parent)
-    : m_hwnd(parent),
+wxTaskBarButtonImpl::wxTaskBarButtonImpl(wxWindow* parent)
+    : m_hwnd(parent->GetHandle()),
       m_taskbarList(NULL),
       m_progressRange(0),
       m_hasInitThumbnailToolbar(false)
@@ -941,11 +941,10 @@ wxThumbBarButton* wxTaskBarButtonImpl::GetThumbBarButtonByIndex(size_t index)
 // ----------------------------------------------------------------------------
 // wxAppProgressIndicator Implementation.
 // ----------------------------------------------------------------------------
-wxAppProgressIndicator::wxAppProgressIndicator(WXWidget parent, int maxValue)
-    : m_parent(parent),
-      m_maxValue(maxValue)
+wxAppProgressIndicator::wxAppProgressIndicator(wxWindow* parent, int maxValue)
+    : m_maxValue(maxValue),
+      m_taskBarButton(new wxTaskBarButtonImpl(parent))
 {
-    m_taskBarButton = new wxTaskBarButtonImpl(m_parent);
     Reset();
     SetRange(m_maxValue);
 }