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

Move wxTaskBarButton into core library.

Browse Source 
Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2014-09-10 14:51:51 +00:00
parent 1439cc95c5
commit c13a06abb0
7 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/bakefiles/files.bkl
View File

@@ -1204,6 +1204,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/xpmdecod.h
wx/xpmhand.h
wx/xrc/xmlreshandler.h
wx/taskbarbutton.h
</set>
<!-- ====================================================================== -->
@@ -2001,6 +2002,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/textentry.cpp
src/msw/tglbtn.cpp
src/msw/treectrl.cpp
src/msw/taskbarbutton.cpp
</set>
<set var="MSW_HDR" hints="files">
wx/generic/clrpickerg.h
@@ -2096,6 +2098,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/toplevel.h
wx/msw/treectrl.h
wx/msw/window.h
wx/msw/taskbarbutton.h
</set>
<set var="MSW_RSC" hints="files">
<!-- Resources must be installed together with headers: -->
@@ -3025,13 +3028,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/richtooltip.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
src/msw/taskbarbutton.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
wx/msw/notifmsg.h
wx/msw/sound.h
wx/msw/taskbar.h
wx/msw/taskbarbutton.h
</set>
<!-- not used with wxUniv -->

3
build/files
View File

@@ -757,6 +757,7 @@ GUI_CMN_HDR =
wx/statbox.h
wx/stattext.h
wx/statusbr.h
wx/taskbarbutton.h
wx/testing.h
wx/textcompleter.h
wx/textctrl.h
@@ -1625,6 +1626,7 @@ MSW_SRC =
src/msw/statusbar.cpp
src/msw/statline.cpp
src/msw/stattext.cpp
src/msw/taskbarbutton.cpp
src/msw/toolbar.cpp
src/msw/textctrl.cpp
src/msw/textentry.cpp
@@ -1716,6 +1718,7 @@ MSW_HDR =
wx/msw/statusbar.h
wx/msw/statline.h
wx/msw/stattext.h
wx/msw/taskbarbutton.h
wx/msw/toolbar.h
wx/msw/textctrl.h
wx/msw/textentry.h

3
build/msw/wx_core.vcxproj
View File

@@ -1002,6 +1002,7 @@
<ClCompile Include="..\..\src\generic\vlbox.cpp" />
<ClCompile Include="..\..\src\generic\vscroll.cpp" />
<ClCompile Include="..\..\src\xrc\xmlreshandler.cpp" />
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -1122,6 +1123,7 @@
<ClInclude Include="..\..\include\wx\msw\statline.h" />
<ClInclude Include="..\..\include\wx\msw\stattext.h" />
<ClInclude Include="..\..\include\wx\msw\statusbar.h" />
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\msw\textctrl.h" />
<ClInclude Include="..\..\include\wx\msw\textentry.h" />
<ClInclude Include="..\..\include\wx\msw\tglbtn.h" />
@@ -1327,6 +1329,7 @@
<ClInclude Include="..\..\include\wx\statline.h" />
<ClInclude Include="..\..\include\wx\stattext.h" />
<ClInclude Include="..\..\include\wx\statusbr.h" />
<ClInclude Include="..\..\include\wx\taskbarbutton.h" />
<ClInclude Include="..\..\include\wx\tbarbase.h" />
<ClInclude Include="..\..\include\wx\textcompleter.h" />
<ClInclude Include="..\..\include\wx\textctrl.h" />

9
build/msw/wx_core.vcxproj.filters
View File

@@ -837,6 +837,9 @@
<ClCompile Include="..\..\src\msw\statusbar.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\taskbarbutton.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\textctrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -1612,6 +1615,9 @@
<ClInclude Include="..\..\include\wx\msw\statusbar.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\taskbarbutton.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\textctrl.h">
<Filter>MSW Headers</Filter>
</ClInclude>
@@ -1792,6 +1798,9 @@
<ClInclude Include="..\..\include\wx\statusbr.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\taskbarbutton.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\tbarbase.h">
<Filter>Common Headers</Filter>
</ClInclude>

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

@@ -17,7 +17,7 @@
struct ITaskbarList3;
class WXDLLIMPEXP_ADV wxTaskBarButtonImpl : public wxTaskBarButton {
class WXDLLIMPEXP_CORE wxTaskBarButtonImpl : public wxTaskBarButton {
public:
virtual ~wxTaskBarButtonImpl();

6
include/wx/taskbarbutton.h
View File

@@ -22,7 +22,7 @@
/**
State of the task bar button.
*/
enum wxTaskBarButtonState
enum WXDLLIMPEXP_CORE wxTaskBarButtonState
{
wxTASKBAR_BUTTON_NO_PROGRESS = 0,
wxTASKBAR_BUTTON_INDETERMINATE = 1,
@@ -31,7 +31,7 @@ enum wxTaskBarButtonState
wxTASKBAR_BUTTON_PAUSED = 8
};
class WXDLLIMPEXP_ADV wxThumbBarButton {
class WXDLLIMPEXP_CORE wxThumbBarButton {
public:
wxThumbBarButton(int id,
const wxIcon& icon,
@@ -64,7 +64,7 @@ private:
bool m_interactive;
};
class WXDLLIMPEXP_ADV wxTaskBarButton
class WXDLLIMPEXP_CORE wxTaskBarButton
{
public:
wxTaskBarButton() { }

3
samples/taskbarbutton/taskbarbutton.cpp
View File

@@ -86,7 +86,8 @@ wxIcon CreateRandomIcon()
wxIcon icon;
icon.CopyFromBitmap(CreateBitmap(*(colours[counter]), 16, 16));
counter = (++counter) % WXSIZEOF(colours);
counter += 1;
counter = counter % WXSIZEOF(colours);
return icon;
}