Compile fixes for samples and dialoged,

small optical improvements,
  distrib changes,
  link fix for treectrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-04 13:01:20 +00:00
parent 2356708db3
commit 33961d59b0
11 changed files with 65 additions and 90 deletions

View File

@@ -37,13 +37,16 @@ class WXDLLEXPORT wxMenu : public wxEvtHandler
public:
// ctors & dtor
#ifdef WXWIN_COMPATIBILITY
wxMenu(const wxString& title,
const wxFunction func)
{
Init(title, func);
}
#endif
wxMenu( long WXUNUSED(style) )
{
Init( wxEmptyString );
}
wxMenu(const wxString& title = wxEmptyString, long WXUNUSED(style) = 0)
{
@@ -143,24 +146,20 @@ public:
size_t CopyAccels(wxAcceleratorEntry *accels) const;
#endif // wxUSE_ACCEL
#ifdef WXWIN_COMPATIBILITY
wxFunction GetCallback() const { return m_callback; }
void Callback(const wxFunction func) { m_callback = func; }
wxFunction m_callback;
#ifdef WXWIN_COMPATIBILITY
// compatibility: these functions are deprecated
bool Enabled(int id) const { return IsEnabled(id); }
bool Checked(int id) const { return IsChecked(id); }
private:
wxFunction m_callback;
#endif // WXWIN_COMPATIBILITY
private:
// common part of all ctors
void Init(const wxString& title
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func = NULL
#endif
);
void Init(const wxString& title, const wxFunction func = NULL );
bool m_doBreak;