projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we need our own imaglist implementation because in wxmac wxIcon does not inherit...
[wxWidgets.git]
/
include
/
wx
/
unix
/
apptrait.h
diff --git
a/include/wx/unix/apptrait.h
b/include/wx/unix/apptrait.h
index 598b4b4d807849cabc794d86c90b2104352dfbea..964413cde7f6e309b21522d0d102d4f080e69943 100644
(file)
--- a/
include/wx/unix/apptrait.h
+++ b/
include/wx/unix/apptrait.h
@@
-5,7
+5,7
@@
// Modified by:
// Created: 23.06.2003
// RCS-ID: $Id$
// Modified by:
// Created: 23.06.2003
// RCS-ID: $Id$
-// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
ndow
s.org>
+// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
dget
s.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-24,7
+24,7
@@
public:
virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
virtual int WaitForChild(wxExecuteData& execData);
virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
virtual int WaitForChild(wxExecuteData& execData);
- virtual wxToolkitInfo
*
GetToolkitInfo();
+ virtual wxToolkitInfo
&
GetToolkitInfo();
};
#if wxUSE_GUI
};
#if wxUSE_GUI
@@
-37,7
+37,10
@@
public:
virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
virtual int WaitForChild(wxExecuteData& execData);
virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
virtual int WaitForChild(wxExecuteData& execData);
- virtual wxToolkitInfo *GetToolkitInfo();
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+ virtual wxStandardPathsBase& GetStandardPaths();
+#endif
+ virtual wxToolkitInfo& GetToolkitInfo();
};
#endif // wxUSE_GUI
};
#endif // wxUSE_GUI