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

Minor whitespace/style fixes

Browse Source 
Remove extra spaces, harmonize the style of "#endif" comments.
This commit is contained in:
Vadim Zeitlin
2017-05-20 17:01:25 +02:00
parent 86a2b6eb28
commit 5353bfc963
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/iconbndl.h
View File

@@ -58,7 +58,7 @@ public:
// initializes the bundle with a single icon // initializes the bundle with a single icon
wxIconBundle(const wxIcon& icon); wxIconBundle(const wxIcon& icon);
#if defined( __WINDOWS__) && wxUSE_ICO_CUR #if defined(__WINDOWS__) && wxUSE_ICO_CUR
// initializes the bundle with the icons from a group icon stored as an MS Windows resource // initializes the bundle with the icons from a group icon stored as an MS Windows resource
wxIconBundle(const wxString& resourceName, WXHINSTANCE module); wxIconBundle(const wxString& resourceName, WXHINSTANCE module);
#endif #endif
@@ -75,7 +75,7 @@ public:
void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
#endif // wxUSE_STREAMS && wxUSE_IMAGE #endif // wxUSE_STREAMS && wxUSE_IMAGE
#if defined( __WINDOWS__) && wxUSE_ICO_CUR #if defined(__WINDOWS__) && wxUSE_ICO_CUR
// loads all the icons from a group icon stored in an MS Windows resource // loads all the icons from a group icon stored in an MS Windows resource
void AddIcon(const wxString& resourceName, WXHINSTANCE module); void AddIcon(const wxString& resourceName, WXHINSTANCE module);
#endif #endif

11
include/wx/private/icondir.h
View File

@@ -18,10 +18,8 @@
// Icon entry and directory structs for .ICO files and // Icon entry and directory structs for .ICO files and
// MS Windows resources are very similar but not identical. // MS Windows resources are very similar but not identical.
#if wxUSE_ICO_CUR #if wxUSE_ICO_CUR
#if wxUSE_STREAMS #if wxUSE_STREAMS
// icon entry in .ICO files // icon entry in .ICO files
@@ -49,7 +47,7 @@ struct ICONDIR
wxUint16 idCount; // how many images? wxUint16 idCount; // how many images?
}; };
#endif // #if wxUSE_STREAMS #endif // wxUSE_STREAMS
#ifdef __WINDOWS__ #ifdef __WINDOWS__
@@ -86,9 +84,8 @@ struct GRPICONDIR
#pragma pack(pop) #pragma pack(pop)
#endif // #ifdef __WINDOWS__ #endif // __WINDOWS__
#endif // wxUSE_ICO_CUR
#endif // #if wxUSE_ICO_CUR #endif // _WX_PRIVATE_ICONDIR_H_
#endif // #ifndef _WX_PRIVATE_ICONDIR_H_

23
interface/wx/iconbndl.h
View File

@@ -69,14 +69,15 @@ public:
wxIconBundle(const wxIcon& icon); wxIconBundle(const wxIcon& icon);
/** /**
Initializes the bundle with all sizes of a group icon with @a resourceName Initializes the bundle with all sizes of a group icon with @a
stored as an MS Windows resource in @a module. When @a module is 0, the current resourceName stored as an MS Windows resource in @a module.
instance is used.
@see AddIcon(const wxString&, WXHINSTANCE) When @a module is 0, the current instance is used.
@onlyfor{wxmsw} @see AddIcon(const wxString&, WXHINSTANCE)
@since 3.1.1
@onlyfor{wxmsw}
@since 3.1.1
*/ */
wxIconBundle(const wxString& resourceName, WXHINSTANCE module); wxIconBundle(const wxString& resourceName, WXHINSTANCE module);
@@ -111,11 +112,13 @@ public:
void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY); void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
/** /**
Loads all sizes of a group icon with @a resourceName stored as an MS Windows Loads all sizes of a group icon with @a resourceName stored as an MS
resource in @a module. When @a module is 0, the current instance is used. Windows resource in @a module.
@onlyfor{wxmsw} When @a module is 0, the current instance is used.
@since 3.1.1
@onlyfor{wxmsw}
@since 3.1.1
*/ */
void AddIcon(const wxString& resourceName, WXHINSTANCE module); void AddIcon(const wxString& resourceName, WXHINSTANCE module);

8
src/common/iconbndl.cpp
View File

@@ -97,7 +97,7 @@ wxIconBundle::wxIconBundle(const wxIcon& icon)
AddIcon(icon); AddIcon(icon);
} }
#if defined( __WINDOWS__) && wxUSE_ICO_CUR #if defined(__WINDOWS__) && wxUSE_ICO_CUR
wxIconBundle::wxIconBundle(const wxString& resourceName, WXHINSTANCE module) wxIconBundle::wxIconBundle(const wxString& resourceName, WXHINSTANCE module)
: wxGDIObject() : wxGDIObject()
@@ -105,7 +105,7 @@ wxIconBundle::wxIconBundle(const wxString& resourceName, WXHINSTANCE module)
AddIcon(resourceName, module); AddIcon(resourceName, module);
} }
#endif // #if defined( __WINDOWS__) && wxUSE_ICO_CUR #endif // defined(__WINDOWS__) && wxUSE_ICO_CUR
wxGDIRefData *wxIconBundle::CreateGDIRefData() const wxGDIRefData *wxIconBundle::CreateGDIRefData() const
{ {
@@ -210,7 +210,7 @@ void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
#endif // wxUSE_STREAMS && wxUSE_IMAGE #endif // wxUSE_STREAMS && wxUSE_IMAGE
#if defined( __WINDOWS__) && wxUSE_ICO_CUR #if defined(__WINDOWS__) && wxUSE_ICO_CUR
// Loads all the icons for an icon group (i.e., different sizes of one icon) // Loads all the icons for an icon group (i.e., different sizes of one icon)
// stored as an MS Windows resource. // stored as an MS Windows resource.
@@ -251,7 +251,7 @@ void wxIconBundle::AddIcon(const wxString& resourceName, WXHINSTANCE module)
} }
} }
#endif // #if defined( __WINDOWS__) && wxUSE_ICO_CUR #endif // defined(__WINDOWS__) && wxUSE_ICO_CUR
wxIcon wxIconBundle::GetIcon(const wxSize& size, int flags) const wxIcon wxIconBundle::GetIcon(const wxSize& size, int flags) const
{ {