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

diff --git a/include/wx/gtk/menu.h b/include/wx/gtk/menu.h
index 300a1918b87804b7a63c55ddf390c3bcbfe27ad5..9896ab085e281314164ffbd2daa49ebebeafafb6 100644 (file)
--- a/include/wx/gtk/menu.h
+++ b/include/wx/gtk/menu.h
@@ -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
 };

diff --git a/include/wx/gtk1/menu.h b/include/wx/gtk1/menu.h
index 300a1918b87804b7a63c55ddf390c3bcbfe27ad5..9896ab085e281314164ffbd2daa49ebebeafafb6 100644 (file)
--- a/include/wx/gtk1/menu.h
+++ b/include/wx/gtk1/menu.h
@@ -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
 };

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index d01b340ad2fe35917bd47762db890d8b58107f2e..577e5fa2a436508fc626080fc0afbdbfa4da03a6 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -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 != "")
   {

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 127c5d9093d502b4338ddbe3cf48e8bf0a698120..b6033cce3a4d997992540767f5c3d57a25542e18 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -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);
 

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index d01b340ad2fe35917bd47762db890d8b58107f2e..577e5fa2a436508fc626080fc0afbdbfa4da03a6 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -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 != "")
   {

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 127c5d9093d502b4338ddbe3cf48e8bf0a698120..b6033cce3a4d997992540767f5c3d57a25542e18 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -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);