Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the usual WXHWND instead of wxWidget.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2014-09-10 14:57:50 +00:00
parent 163a78c76c
commit 49ed30caae
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/taskbarbutton.h
View File

@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxITaskbarList3;
class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton
{ {
public: public:
wxTaskBarButtonImpl(WXWidget parent); wxTaskBarButtonImpl(wxWindow* parent);
virtual ~wxTaskBarButtonImpl(); virtual ~wxTaskBarButtonImpl();
virtual void SetProgressRange(int range) wxOVERRIDE; virtual void SetProgressRange(int range) wxOVERRIDE;
@@ -47,7 +47,7 @@ public:
bool InitOrUpdateThumbBarButtons(); bool InitOrUpdateThumbBarButtons();
private: private:
WXWidget m_hwnd; WXHWND m_hwnd;
wxITaskbarList3 *m_taskbarList; wxITaskbarList3 *m_taskbarList;
typedef wxVector<wxThumbBarButton*> wxThumbBarButtons; typedef wxVector<wxThumbBarButton*> wxThumbBarButtons;

3
include/wx/taskbarbutton.h
View File

@@ -134,7 +134,7 @@ private:
class WXDLLIMPEXP_CORE wxAppProgressIndicator class WXDLLIMPEXP_CORE wxAppProgressIndicator
{ {
public: public:
wxAppProgressIndicator(WXWidget parent, int maxValue); wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100);
virtual ~wxAppProgressIndicator(); virtual ~wxAppProgressIndicator();
void SetValue(int value); void SetValue(int value);
void SetRange(int range); void SetRange(int range);
@@ -142,7 +142,6 @@ public:
void Reset(); void Reset();
private: private:
WXWidget m_parent;
int m_maxValue; int m_maxValue;
wxTaskBarButton* m_taskBarButton; wxTaskBarButton* m_taskBarButton;

2
src/msw/frame.cpp
View File

@@ -994,7 +994,7 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
#if wxUSE_TASKBARBUTTON #if wxUSE_TASKBARBUTTON
if ( message == wxMsgTaskbarButtonCreated ) if ( message == wxMsgTaskbarButtonCreated )
{ {
m_taskBarButton = new wxTaskBarButtonImpl(GetHandle()); m_taskBarButton = new wxTaskBarButtonImpl(this);
processed = true; processed = true;
} }
#endif #endif

2
src/msw/gauge.cpp
View File

@@ -103,7 +103,7 @@ bool wxGauge::Create(wxWindow *parent,
if ( topParent != NULL ) if ( topParent != NULL )
{ {
m_appProgressIndicator = m_appProgressIndicator =
new wxAppProgressIndicator(topParent->GetHandle(), range); new wxAppProgressIndicator(topParent, range);
} }
} }
#endif #endif

11
src/msw/taskbarbutton.cpp
View File

@@ -696,8 +696,8 @@ bool wxThumbBarButton::UpdateParentTaskBarButton()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxTaskBarButtonImpl Implementation. // wxTaskBarButtonImpl Implementation.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxTaskBarButtonImpl::wxTaskBarButtonImpl(WXWidget parent) wxTaskBarButtonImpl::wxTaskBarButtonImpl(wxWindow* parent)
: m_hwnd(parent), : m_hwnd(parent->GetHandle()),
m_taskbarList(NULL), m_taskbarList(NULL),
m_progressRange(0), m_progressRange(0),
m_hasInitThumbnailToolbar(false) m_hasInitThumbnailToolbar(false)
@@ -941,11 +941,10 @@ wxThumbBarButton* wxTaskBarButtonImpl::GetThumbBarButtonByIndex(size_t index)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxAppProgressIndicator Implementation. // wxAppProgressIndicator Implementation.
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxAppProgressIndicator::wxAppProgressIndicator(WXWidget parent, int maxValue) wxAppProgressIndicator::wxAppProgressIndicator(wxWindow* parent, int maxValue)
: m_parent(parent), : m_maxValue(maxValue),
m_maxValue(maxValue) m_taskBarButton(new wxTaskBarButtonImpl(parent))
{ {
m_taskBarButton = new wxTaskBarButtonImpl(m_parent);
Reset(); Reset();
SetRange(m_maxValue); SetRange(m_maxValue);
} }