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

no changes, just reformat, remove extraneous semicolons and inline keywords

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-21 16:18:43 +00:00
parent f1ca421b41
commit e48df5d353
1 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/wx/osx/carbon/icon.h
View File

@@ -50,7 +50,7 @@ public:
void SetDepth(int d); void SetDepth(int d);
void SetOk(bool isOk); void SetOk(bool isOk);
WXHICON GetHICON() const ; WXHICON GetHICON() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const;
@@ -60,44 +60,30 @@ private:
DECLARE_DYNAMIC_CLASS(wxIcon) DECLARE_DYNAMIC_CLASS(wxIcon)
}; };
/*
class WXDLLIMPEXP_CORE wxICONFileHandler: public wxBitmapHandler
{
DECLARE_DYNAMIC_CLASS(wxICONFileHandler)
public:
inline wxICONFileHandler()
{
m_name = "ICO icon file";
m_extension = "ico";
m_type = wxBITMAP_TYPE_ICO;
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth = -1, int desiredHeight = -1);
};
*/
class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler
{ {
DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
public: public:
inline wxICONResourceHandler() wxICONResourceHandler()
{ {
SetName(wxT("ICON resource")); SetName(wxT("ICON resource"));
SetExtension(wxEmptyString); SetExtension(wxEmptyString);
SetType(wxBITMAP_TYPE_ICON_RESOURCE); SetType(wxBITMAP_TYPE_ICON_RESOURCE);
}; }
virtual bool LoadFile(wxBitmap *bitmap, virtual bool LoadFile(wxBitmap *bitmap,
const wxString& name, const wxString& name,
wxBitmapType flags, wxBitmapType flags,
int desiredWidth = -1, int desiredWidth = -1,
int desiredHeight = -1); int desiredHeight = -1);
// unhide the base class virtual
virtual bool LoadFile(wxBitmap *bitmap, // unhide the base class virtual
const wxString& name, virtual bool LoadFile(wxBitmap *bitmap,
wxBitmapType flags) const wxString& name,
{ return LoadFile(bitmap, name, flags, -1, -1); } wxBitmapType flags)
{ return LoadFile(bitmap, name, flags, -1, -1); }
private:
DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
}; };
#endif #endif