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

Rename appprog.{h,cpp} to appprogress.{h.cpp}.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2014-09-10 14:58:55 +00:00
parent eb6ed7e74c
commit 124129a45f
8 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/files.bkl
View File

@@ -1097,7 +1097,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/access.h
wx/anidecod.h
wx/animdecod.h
wx/appprog.h
wx/appprogress.h
wx/artprov.h
wx/bitmap.h
wx/bookctrl.h
@@ -1955,7 +1955,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/accel.cpp
src/msw/anybutton.cpp
src/msw/artmsw.cpp
src/msw/appprog.cpp
src/msw/appprogress.cpp
src/msw/bmpbuttn.cpp
src/msw/button.cpp
src/msw/checkbox.cpp

6
build/msw/wx_core.vcxproj
View File

@@ -603,7 +603,7 @@
<ClCompile Include="..\..\src\msw\ole\activex.cpp" />
<ClCompile Include="..\..\src\msw\anybutton.cpp" />
<ClCompile Include="..\..\src\msw\app.cpp" />
<ClCompile Include="..\..\src\msw\appprog.cpp" />
<ClCompile Include="..\..\src\msw\appprogress.cpp" />
<ClCompile Include="..\..\src\msw\artmsw.cpp" />
<ClCompile Include="..\..\src\msw\ole\automtn.cpp" />
<ClCompile Include="..\..\src\msw\bitmap.cpp" />
@@ -1025,7 +1025,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</CustomBuild>
<ClInclude Include="..\..\include\wx\msw\accel.h" />
<ClInclude Include="..\..\include\wx\msw\appprog.h" />
<ClInclude Include="..\..\include\wx\msw\appprogress.h" />
<ClInclude Include="..\..\include\wx\msw\ole\access.h" />
<ClInclude Include="..\..\include\wx\msw\ole\activex.h" />
<ClInclude Include="..\..\include\wx\msw\anybutton.h" />
@@ -1177,7 +1177,7 @@
<ClInclude Include="..\..\include\wx\anidecod.h" />
<ClInclude Include="..\..\include\wx\animdecod.h" />
<ClInclude Include="..\..\include\wx\anybutton.h" />
<ClInclude Include="..\..\include\wx\appprog.h" />
<ClInclude Include="..\..\include\wx\appprogress.h" />
<ClInclude Include="..\..\include\wx\artprov.h" />
<ClInclude Include="..\..\include\wx\bitmap.h" />
<ClInclude Include="..\..\include\wx\bmpbuttn.h" />

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

@@ -558,7 +558,7 @@
<ClCompile Include="..\..\src\msw\app.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\appprog.cpp">
<ClCompile Include="..\..\src\msw\appprogress.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\artmsw.cpp">
@@ -1351,7 +1351,7 @@
<ClInclude Include="..\..\include\wx\msw\app.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\appprog.h">
<ClInclude Include="..\..\include\wx\msw\appprogress.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\msw\bitmap.h">
@@ -1654,7 +1654,7 @@
<ClInclude Include="..\..\include\wx\msw\window.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\appprog.h">
<ClInclude Include="..\..\include\wx\appprogress.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\nativewin.h">

9
include/wx/appprog.h → include/wx/appprogress.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/appprog.h
// Name: wx/appprogress.h
// Purpose: wxAppProgressIndicator interface.
// Author: Chaobin Zhang <zhchbin@gmail.com>
// Created: 2014-09-05
@@ -11,11 +11,6 @@
#define _WX_APPPROG_H_
#include "wx/defs.h"
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
class WXDLLIMPEXP_CORE wxAppProgressIndicatorBase
{
@@ -32,7 +27,7 @@ private:
};
#if defined(__WXMSW__)
#include "wx/msw/appprog.h"
#include "wx/msw/appprogress.h"
#endif
#endif // _WX_APPPROG_H_

2
include/wx/msw/appprog.h → include/wx/msw/appprogress.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/appprog.h
// Name: wx/msw/appprogress.h
// Purpose: wxAppProgressIndicator interface.
// Author: Chaobin Zhang <zhchbin@gmail.com>
// Created: 2014-09-05

10
interface/wx/appprog.h → interface/wx/appprogress.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: taskbarbutton.h
// Name: interface/wx/appprogress.h
// Purpose: interface of wxAppProgressIndicator
// Author: wxWidgets team
// Licence: wxWindows licence
@@ -27,11 +27,17 @@ public:
@param parent
The parent window of wxAppProgressIndicator. Note that the
window should has taskbar button showing. If parent is NULL,
the progress will reflect on the taskbar buttons of all the
the progress will reflect on the taskbar buttons of all the
top level windows.
@param maxValue
Integer range (maximum value) of the progress indicator.
*/
wxAppProgressIndicator(wxWindow* parent = NULL, int maxValue = 100);
/**
Destructor, stops displaying progress and returns the indicator to its
normal state.
*/
virtual ~wxAppProgressIndicator();
/**

2
src/msw/appprog.cpp → src/msw/appprogress.cpp
View File

@@ -17,7 +17,7 @@
#include "wx/toplevel.h"
#endif
#include "wx/appprog.h"
#include "wx/appprogress.h"
#include "wx/msw/taskbarbutton.h"
// ----------------------------------------------------------------------------

2
src/msw/gauge.cpp
View File

@@ -33,7 +33,7 @@
#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
#endif
#include "wx/appprog.h"
#include "wx/appprogress.h"
#include "wx/msw/private.h"
// ----------------------------------------------------------------------------