Fixed resizing of wxTextCtrl
Added clientdata to menu git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
62bd087498
commit
41dee9d0ce
@ -114,7 +114,11 @@ public:
|
||||
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
|
||||
inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
|
||||
|
||||
public:
|
||||
inline void SetClientData( void* clientData ) { m_clientData = clientData; }
|
||||
inline void* GetClientData() const { return m_clientData; }
|
||||
|
||||
// implementation
|
||||
|
||||
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
|
||||
void SetInvokingWindow( wxWindow *win );
|
||||
wxWindow *GetInvokingWindow();
|
||||
@ -124,6 +128,7 @@ public:
|
||||
wxWindow *m_invokingWindow;
|
||||
wxFunction m_callback;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
void *m_clientData;
|
||||
|
||||
GtkWidget *m_menu; // GtkMenu
|
||||
};
|
||||
|
@ -114,7 +114,11 @@ public:
|
||||
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
|
||||
inline wxEvtHandler *GetEventHandler() { return m_eventHandler; }
|
||||
|
||||
public:
|
||||
inline void SetClientData( void* clientData ) { m_clientData = clientData; }
|
||||
inline void* GetClientData() const { return m_clientData; }
|
||||
|
||||
// implementation
|
||||
|
||||
int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
|
||||
void SetInvokingWindow( wxWindow *win );
|
||||
wxWindow *GetInvokingWindow();
|
||||
@ -124,6 +128,7 @@ public:
|
||||
wxWindow *m_invokingWindow;
|
||||
wxFunction m_callback;
|
||||
wxEvtHandler *m_eventHandler;
|
||||
void *m_clientData;
|
||||
|
||||
GtkWidget *m_menu; // GtkMenu
|
||||
};
|
||||
|
@ -262,8 +262,11 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
|
||||
m_items.DeleteContents( TRUE );
|
||||
m_invokingWindow = (wxWindow *) NULL;
|
||||
m_menu = gtk_menu_new(); // Do not show!
|
||||
|
||||
m_callback = func;
|
||||
m_eventHandler = this;
|
||||
m_clientData = (void*) NULL;
|
||||
|
||||
if (m_title.IsNull()) m_title = "";
|
||||
if (m_title != "")
|
||||
{
|
||||
|
@ -84,7 +84,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
||||
// ... and put into the upper left hand corner of the table
|
||||
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
|
||||
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
|
||||
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND),
|
||||
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
|
||||
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
|
||||
0, 0);
|
||||
|
||||
|
@ -262,8 +262,11 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
|
||||
m_items.DeleteContents( TRUE );
|
||||
m_invokingWindow = (wxWindow *) NULL;
|
||||
m_menu = gtk_menu_new(); // Do not show!
|
||||
|
||||
m_callback = func;
|
||||
m_eventHandler = this;
|
||||
m_clientData = (void*) NULL;
|
||||
|
||||
if (m_title.IsNull()) m_title = "";
|
||||
if (m_title != "")
|
||||
{
|
||||
|
@ -84,7 +84,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
||||
// ... and put into the upper left hand corner of the table
|
||||
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
|
||||
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
|
||||
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND),
|
||||
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
|
||||
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
|
||||
0, 0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user