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

wxMenu ctor made compatible again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-07-19 22:17:40 +00:00
parent 910484a67d
commit b908d2244a
9 changed files with 122 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/wx/gtk/menu.h
View File

@@ -112,9 +112,17 @@ class wxMenu : public wxEvtHandler
DECLARE_DYNAMIC_CLASS(wxMenu)
public:
wxMenu( const wxString& title = wxEmptyString,
const wxFunction func = (wxFunction) NULL,
long style = 0);
#ifdef WXWIN_COMPATIBILITY
wxMenu( const wxString& title, const wxFunction func)
{
Init(title, 0, func);
}
#endif
wxMenu( const wxString& title = wxEmptyString, long style = 0 )
{
Init(title, style, NULL);
}
wxMenu( long style );
~wxMenu();
@@ -172,6 +180,8 @@ public:
// compatibility: these functions are deprecated
bool Enabled(int id) const { return IsEnabled(id); }
bool Checked(int id) const { return IsChecked(id); }
wxFunction m_callback;
#endif // WXWIN_COMPATIBILITY
// implementation
@@ -186,17 +196,20 @@ public:
GtkItemFactory *m_factory;
// used by wxMenuBar
inline long GetStyle(void) const { return m_style; }
private:
long GetStyle(void) const { return m_style; }
private:
// common code for both constructors:
void Init( const wxString& title,
const wxFunction func,
long style);
long style
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func
#endif
);
wxString m_title;
wxList m_items;
wxWindow *m_invokingWindow;
wxFunction m_callback;
wxEvtHandler *m_eventHandler;
void *m_clientData;
long m_style;

29
include/wx/gtk1/menu.h
View File

@@ -112,9 +112,17 @@ class wxMenu : public wxEvtHandler
DECLARE_DYNAMIC_CLASS(wxMenu)
public:
wxMenu( const wxString& title = wxEmptyString,
const wxFunction func = (wxFunction) NULL,
long style = 0);
#ifdef WXWIN_COMPATIBILITY
wxMenu( const wxString& title, const wxFunction func)
{
Init(title, 0, func);
}
#endif
wxMenu( const wxString& title = wxEmptyString, long style = 0 )
{
Init(title, style, NULL);
}
wxMenu( long style );
~wxMenu();
@@ -172,6 +180,8 @@ public:
// compatibility: these functions are deprecated
bool Enabled(int id) const { return IsEnabled(id); }
bool Checked(int id) const { return IsChecked(id); }
wxFunction m_callback;
#endif // WXWIN_COMPATIBILITY
// implementation
@@ -186,17 +196,20 @@ public:
GtkItemFactory *m_factory;
// used by wxMenuBar
inline long GetStyle(void) const { return m_style; }
private:
long GetStyle(void) const { return m_style; }
private:
// common code for both constructors:
void Init( const wxString& title,
const wxFunction func,
long style);
long style
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func
#endif
);
wxString m_title;
wxList m_items;
wxWindow *m_invokingWindow;
wxFunction m_callback;
wxEvtHandler *m_eventHandler;
void *m_clientData;
long m_style;

2
include/wx/help.h
View File

@@ -6,6 +6,8 @@
#ifdef __WXMSW__
#include "wx/msw/helpwin.h"
#undef wxHelpController
#undef sm_classwxHelpController
#define wxHelpController wxWinHelpController
#define sm_classwxHelpController sm_classwxWinHelpController
#else // !MSW

2
include/wx/msw/listbox.h
View File

@@ -129,6 +129,8 @@ protected:
int m_noItems;
int m_selected;
virtual wxSize DoGetBestSize();
#if wxUSE_OWNER_DRAWN
// control items
wxListBoxItemsArray m_aItems;

23
include/wx/msw/menu.h
View File

@@ -36,8 +36,20 @@ class WXDLLEXPORT wxMenu : public wxEvtHandler
DECLARE_DYNAMIC_CLASS(wxMenu)
public:
// ctor & dtor
wxMenu(const wxString& title = wxEmptyString, const wxFunction func = NULL);
// ctors & dtor
#ifdef WXWIN_COMPATIBILITY
wxMenu(const wxString& title,
const wxFunction func)
{
Init(title, func);
}
#endif
wxMenu(const wxString& title = wxEmptyString, long WXUNUSED(style) = 0)
{
Init(title);
}
virtual ~wxMenu();
// construct menu
@@ -143,6 +155,13 @@ private:
#endif // WXWIN_COMPATIBILITY
private:
// common part of all ctors
void Init(const wxString& title
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func = NULL
#endif
);
bool m_doBreak;
// This is used when m_hMenu is NULL because we don't want to

19
src/gtk/menu.cpp
View File

@@ -501,15 +501,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu );
/* wxMSW doesn't call callback here either
if (menu->m_callback)
{
(void) (*(menu->m_callback)) (*menu, event);
return;
}
*/
if (menu->GetEventHandler()->ProcessEvent(event))
return;
@@ -646,7 +637,12 @@ wxMenu::wxMenu(long style)
}
void
wxMenu::Init( const wxString& title, const wxFunction func, long style )
wxMenu::Init( const wxString& title,
long style,
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func
#endif
)
{
m_title = title;
m_items.DeleteContents( TRUE );
@@ -661,7 +657,10 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
m_menu = gtk_menu_new(); // Do not show!
#endif
#ifdef WXWIN_COMPATIBILITY
m_callback = func;
#endif
m_eventHandler = this;
m_clientData = (void*) NULL;

19
src/gtk1/menu.cpp
View File

@@ -501,15 +501,6 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
wxMenuEvent event( wxEVT_MENU_HIGHLIGHT, id );
event.SetEventObject( menu );
/* wxMSW doesn't call callback here either
if (menu->m_callback)
{
(void) (*(menu->m_callback)) (*menu, event);
return;
}
*/
if (menu->GetEventHandler()->ProcessEvent(event))
return;
@@ -646,7 +637,12 @@ wxMenu::wxMenu(long style)
}
void
wxMenu::Init( const wxString& title, const wxFunction func, long style )
wxMenu::Init( const wxString& title,
long style,
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func
#endif
)
{
m_title = title;
m_items.DeleteContents( TRUE );
@@ -661,7 +657,10 @@ wxMenu::Init( const wxString& title, const wxFunction func, long style )
m_menu = gtk_menu_new(); // Do not show!
#endif
#ifdef WXWIN_COMPATIBILITY
m_callback = func;
#endif
m_eventHandler = this;
m_clientData = (void*) NULL;

29
src/msw/listbox.cpp
View File

@@ -650,6 +650,35 @@ bool wxListBox::SetStringSelection (const wxString& s, bool flag)
return FALSE;
}
wxSize wxListBox::DoGetBestSize()
{
// find the widest string
int wLine;
int wListbox = 0;
for ( int i = 0; i < m_noItems; i++ )
{
wxString str(GetString(i));
GetTextExtent(str, &wLine, NULL);
if ( wLine > wListbox )
wListbox = wLine;
}
// give it some reasonable default value if there are no strings in the
// list
if ( wListbox == 0 )
wListbox = 100;
// the listbox should be slightly larger than the widest string
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
wListbox += 3*cx;
int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMax(m_noItems, 7));
return wxSize(wListbox, hListbox);
}
// Is this the right thing? Won't setselection generate a command
// event too? No! It'll just generate a setselection event.
// But we still can't have this being called whenever a real command

8
src/msw/menu.cpp
View File

@@ -78,9 +78,13 @@ static const int idMenuTitle = -2;
// ---------------------------------------------------------------------------
// Construct a menu with optional title (then use append)
wxMenu::wxMenu(const wxString& title, const wxFunction func)
: m_title(title)
void wxMenu::Init(const wxString& title
#ifdef WXWIN_COMPATIBILITY
, const wxFunction func
#endif
)
{
m_title = title;
m_parent = NULL;
m_eventHandler = this;
m_pInvokingWindow = NULL;