projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unicode fixes
[wxWidgets.git]
/
src
/
cocoa
/
icon.cpp
diff --git
a/src/cocoa/icon.cpp
b/src/cocoa/icon.cpp
index 26a7c1b1ebecbf94c656f0b0e5b26c41f992eb6c..f473c7b275abdab31a623c40b198f1418dfd8193 100644
(file)
--- a/
src/cocoa/icon.cpp
+++ b/
src/cocoa/icon.cpp
@@
-28,6
+28,14
@@
wxIcon::wxIcon()
{
}
{
}
+wxIcon::wxIcon(const char **xpm)
+{
+}
+
+wxIcon::wxIcon(char **xpm)
+{
+}
+
wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
{
}
wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
{
}
@@
-48,12
+56,7
@@
bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
{
UnRef();
{
UnRef();
- wxBitmapHandler *handler = FindHandler(type);
-
- if ( handler )
- return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
- else
- return FALSE;
+ return FALSE;
}
void wxIcon::CopyFromBitmap(const wxBitmap& icno)
}
void wxIcon::CopyFromBitmap(const wxBitmap& icno)