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

Fixed resizing of wxTextCtrl

Browse Source 
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:
Robert Roebling
1998-11-16 07:18:28 +00:00
parent 62bd087498
commit 41dee9d0ce
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,11 @@ public:
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
inline wxEvtHandler *GetEventHandler() { return m_eventHandler; } 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; int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
void SetInvokingWindow( wxWindow *win ); void SetInvokingWindow( wxWindow *win );
wxWindow *GetInvokingWindow(); wxWindow *GetInvokingWindow();
@@ -124,6 +128,7 @@ public:
wxWindow *m_invokingWindow; wxWindow *m_invokingWindow;
wxFunction m_callback; wxFunction m_callback;
wxEvtHandler *m_eventHandler; wxEvtHandler *m_eventHandler;
void *m_clientData;
GtkWidget *m_menu; // GtkMenu GtkWidget *m_menu; // GtkMenu
}; };

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

@@ -114,7 +114,11 @@ public:
inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; } inline void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
inline wxEvtHandler *GetEventHandler() { return m_eventHandler; } 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; int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;
void SetInvokingWindow( wxWindow *win ); void SetInvokingWindow( wxWindow *win );
wxWindow *GetInvokingWindow(); wxWindow *GetInvokingWindow();
@@ -124,6 +128,7 @@ public:
wxWindow *m_invokingWindow; wxWindow *m_invokingWindow;
wxFunction m_callback; wxFunction m_callback;
wxEvtHandler *m_eventHandler; wxEvtHandler *m_eventHandler;
void *m_clientData;
GtkWidget *m_menu; // GtkMenu GtkWidget *m_menu; // GtkMenu
}; };

3
src/gtk/menu.cpp
View File

@@ -262,8 +262,11 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
m_items.DeleteContents( TRUE ); m_items.DeleteContents( TRUE );
m_invokingWindow = (wxWindow *) NULL; m_invokingWindow = (wxWindow *) NULL;
m_menu = gtk_menu_new(); // Do not show! m_menu = gtk_menu_new(); // Do not show!
m_callback = func; m_callback = func;
m_eventHandler = this; m_eventHandler = this;
m_clientData = (void*) NULL;
if (m_title.IsNull()) m_title = ""; if (m_title.IsNull()) m_title = "";
if (m_title != "") if (m_title != "")
{ {

2
src/gtk/textctrl.cpp
View File

@@ -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 // ... and put into the upper left hand corner of the table
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE); m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1, 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), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
0, 0); 0, 0);

3
src/gtk1/menu.cpp
View File

@@ -262,8 +262,11 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
m_items.DeleteContents( TRUE ); m_items.DeleteContents( TRUE );
m_invokingWindow = (wxWindow *) NULL; m_invokingWindow = (wxWindow *) NULL;
m_menu = gtk_menu_new(); // Do not show! m_menu = gtk_menu_new(); // Do not show!
m_callback = func; m_callback = func;
m_eventHandler = this; m_eventHandler = this;
m_clientData = (void*) NULL;
if (m_title.IsNull()) m_title = ""; if (m_title.IsNull()) m_title = "";
if (m_title != "") if (m_title != "")
{ {

2
src/gtk1/textctrl.cpp
View File

@@ -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 // ... and put into the upper left hand corner of the table
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE); m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1, 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), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
0, 0); 0, 0);