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

A few compile things.

Browse Source 
Changed resizing of multi-line text ctrl.
  Augmented beta version to 8.
  Distribution things.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-11 15:56:57 +00:00
parent e1f36ff823
commit d1af991f49
19 changed files with 144 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk1/bmpbuttn.cpp
View File

@@ -148,14 +148,14 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
gtk_widget_show( pixmap );
gtk_container_add( GTK_CONTAINER(m_widget), pixmap );
int border = 10;
if (style & wxNO_BORDER) border = 4;
if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
SetSize( newSize.x, newSize.y );
}
int border = 10;
if (style & wxNO_BORDER) border = 4;
if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border;
if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border;
SetSize( newSize.x, newSize.y );
gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );

6
src/gtk1/notebook.cpp
View File

@@ -515,6 +515,9 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
page->m_box = gtk_hbox_new( FALSE, 0 );
gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 );
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
if (position < 0)
gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
else
@@ -522,9 +525,6 @@ bool wxNotebook::InsertPage( int position, wxWindow* win, const wxString& text,
page->m_page = (GtkNotebookPage*) g_list_last(notebook->children)->data;
gtk_signal_connect( GTK_OBJECT(win->m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)win );
/* set the label image */
page->m_image = imageId;

5
src/gtk1/win_gtk.c
View File

@@ -10,6 +10,7 @@
#include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h"
#include "gtk/gtknotebook.h"
#include "gtk/gtktable.h"
#ifdef __cplusplus
extern "C" {
@@ -327,7 +328,9 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed,
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed))
{
if ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget)))
if ( ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget))) ||
/* I don't know why GtkTable is different */
GTK_IS_TABLE(widget))
{
child_allocation.x = child->x;
child_allocation.y = child->y;