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

18
distrib/gtk/copy_src
View File

@@ -68,6 +68,13 @@ cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/generic
cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/generic cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/generic
cd .. cd ..
mkdir ~/wxgtk_dist/wxGTK/include/wx/html
cd html
cp *.h ~/wxgtk_dist/wxGTK/include/wx/html
cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/html
cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/html
cd ..
mkdir ~/wxgtk_dist/wxGTK/include/wx/unix mkdir ~/wxgtk_dist/wxGTK/include/wx/unix
cd unix cd unix
cp *.h ~/wxgtk_dist/wxGTK/include/wx/unix cp *.h ~/wxgtk_dist/wxGTK/include/wx/unix
@@ -154,6 +161,15 @@ mkdir ~/wxgtk_dist/wxGTK/src/unix
cp *.cpp ~/wxgtk_dist/wxGTK/src/unix cp *.cpp ~/wxgtk_dist/wxGTK/src/unix
cd .. cd ..
cd html
mkdir ~/wxgtk_dist/wxGTK/src/html
cp *.cpp ~/wxgtk_dist/wxGTK/src/html
cp *.h ~/wxgtk_dist/wxGTK/src/html
cd bitmaps
mkdir ~/wxgtk_dist/wxGTK/src/html/bitmaps
cp *.xpm ~/wxgtk_dist/wxGTK/src/html/bitmaps
cd ../..
cd generic cd generic
mkdir ~/wxgtk_dist/wxGTK/src/generic mkdir ~/wxgtk_dist/wxGTK/src/generic
cp *.cpp ~/wxgtk_dist/wxGTK/src/generic cp *.cpp ~/wxgtk_dist/wxGTK/src/generic
@@ -776,4 +792,4 @@ cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src
cd ~/wxgtk_dist cd ~/wxgtk_dist
tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b7.tgz tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b7b.tgz

16
distrib/motif/copy_src
View File

@@ -68,6 +68,13 @@ cp Makefile.am ~/wxmotif_dist/wxMotif/include/wx/generic
cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/generic cp Makefile.in ~/wxmotif_dist/wxMotif/include/wx/generic
cd .. cd ..
mkdir ~/wxgtk_dist/wxGTK/include/wx/html
cd html
cp *.h ~/wxgtk_dist/wxGTK/include/wx/html
cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/html
cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/html
cd ..
mkdir ~/wxmotif_dist/wxMotif/include/wx/unix mkdir ~/wxmotif_dist/wxMotif/include/wx/unix
cd unix cd unix
cp *.h ~/wxmotif_dist/wxMotif/include/wx/unix cp *.h ~/wxmotif_dist/wxMotif/include/wx/unix
@@ -149,6 +156,15 @@ cp extended.c ~/wxmotif_dist/wxMotif/src/common
cp *.cpp ~/wxmotif_dist/wxMotif/src/common cp *.cpp ~/wxmotif_dist/wxMotif/src/common
cd .. cd ..
cd html
mkdir ~/wxgtk_dist/wxGTK/src/html
cp *.cpp ~/wxgtk_dist/wxGTK/src/html
cp *.h ~/wxgtk_dist/wxGTK/src/html
cd bitmaps
mkdir ~/wxgtk_dist/wxGTK/src/html/bitmaps
cp *.xpm ~/wxgtk_dist/wxGTK/src/html/bitmaps
cd ../..
cd unix cd unix
mkdir ~/wxmotif_dist/wxMotif/src/unix mkdir ~/wxmotif_dist/wxMotif/src/unix
cp *.cpp ~/wxmotif_dist/wxMotif/src/unix cp *.cpp ~/wxmotif_dist/wxMotif/src/unix

16
distrib/wine/copy_src
View File

@@ -68,6 +68,13 @@ cp Makefile.am ~/wxwine_dist/wxWINE/include/wx/generic
cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/generic cp Makefile.in ~/wxwine_dist/wxWINE/include/wx/generic
cd .. cd ..
mkdir ~/wxgtk_dist/wxGTK/include/wx/html
cd html
cp *.h ~/wxgtk_dist/wxGTK/include/wx/html
cp Makefile.am ~/wxgtk_dist/wxGTK/include/wx/html
cp Makefile.in ~/wxgtk_dist/wxGTK/include/wx/html
cd ..
mkdir ~/wxwine_dist/wxWINE/include/wx/unix mkdir ~/wxwine_dist/wxWINE/include/wx/unix
cd unix cd unix
cp *.h ~/wxwine_dist/wxWINE/include/wx/unix cp *.h ~/wxwine_dist/wxWINE/include/wx/unix
@@ -149,6 +156,15 @@ cp extended.c ~/wxwine_dist/wxWINE/src/common
cp *.cpp ~/wxwine_dist/wxWINE/src/common cp *.cpp ~/wxwine_dist/wxWINE/src/common
cd .. cd ..
cd html
mkdir ~/wxgtk_dist/wxGTK/src/html
cp *.cpp ~/wxgtk_dist/wxGTK/src/html
cp *.h ~/wxgtk_dist/wxGTK/src/html
cd bitmaps
mkdir ~/wxgtk_dist/wxGTK/src/html/bitmaps
cp *.xpm ~/wxgtk_dist/wxGTK/src/html/bitmaps
cd ../..
cd unix cd unix
mkdir ~/wxwine_dist/wxWINE/src/unix mkdir ~/wxwine_dist/wxWINE/src/unix
cp *.cpp ~/wxwine_dist/wxWINE/src/unix cp *.cpp ~/wxwine_dist/wxWINE/src/unix

14
include/wx/busyinfo.h
View File

@@ -3,6 +3,7 @@
// Purpose: Information window (when app is busy) // Purpose: Information window (when app is busy)
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik
// RCS-ID: $Id$
// Licence: wxWindows Licence // Licence: wxWindows Licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -10,26 +11,19 @@
#define __INFOWIN_H__ #define __INFOWIN_H__
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation #pragma interface
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORDLANDC__ #ifdef __BORDLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WXPRECOMP #include "wx/frame.h"
#include <wx/wx.h>
#endif
#if wxUSE_BUSYINFO #if wxUSE_BUSYINFO
#include <wx/dialog.h>
class wxInfoFrame : public wxFrame class wxInfoFrame : public wxFrame
{ {
public: public:

4
include/wx/html/Makefile.am
View File

@@ -14,6 +14,4 @@ htmlparser.h \
htmltag.h \ htmltag.h \
htmlwin.h \ htmlwin.h \
htmlwinparser.h \ htmlwinparser.h \
mod_templ.h \ mod_templ.h
msw \
version.h

1
include/wx/log.h
View File

@@ -17,6 +17,7 @@
#endif #endif
#include "wx/setup.h" #include "wx/setup.h"
#include "wx/string.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward declarations // forward declarations

2
include/wx/version.h
View File

@@ -18,7 +18,7 @@
#define wxRELEASE_NUMBER 0 #define wxRELEASE_NUMBER 0
#define wxVERSION_STRING "wxWindows 2.1.0" #define wxVERSION_STRING "wxWindows 2.1.0"
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
#define wxBETA_NUMBER 7 #define wxBETA_NUMBER 8
#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0) #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
#endif #endif

12
include/wx/zipstream.h
View File

@@ -13,9 +13,11 @@
#pragma interface #pragma interface
#endif #endif
#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM #include "wx/defs.h"
#include <wx/stream.h> #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#include "wx/stream.h"
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// wxZipInputStream // wxZipInputStream
@@ -48,9 +50,11 @@ class WXDLLEXPORT wxZipInputStream : public wxInputStream
}; };
#endif // #endif
// wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#endif // __ZIPSTREAM_H__ #endif
// __ZIPSTREAM_H__

4
src/common/valtext.cpp
View File

@@ -20,10 +20,6 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
#endif
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
#ifndef WX_PRECOMP #ifndef WX_PRECOMP

8
src/common/wfstream.cpp
View File

@@ -20,15 +20,11 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
#endif
#if wxUSE_STREAMS && wxUSE_FILE #if wxUSE_STREAMS && wxUSE_FILE
#include <stdio.h> #include <stdio.h>
#include <wx/stream.h> #include "wx/stream.h"
#include <wx/wfstream.h> #include "wx/wfstream.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxFileInputStream // wxFileInputStream

51
src/common/zipstream.cpp
View File

@@ -7,29 +7,25 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation #pragma implementation "zipstream.h"
#endif #endif
#include <wx/wxprec.h> // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORDLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WXPRECOMP #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
#include <wx/wx.h>
#endif
#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM #include "wx/log.h"
#include "wx/intl.h"
#include <wx/stream.h> #include "wx/stream.h"
#include <wx/wfstream.h> #include "wx/wfstream.h"
#include <wx/zipstream.h> #include "wx/zipstream.h"
#include "unzip.h" #include "unzip.h"
wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file) : wxInputStream() wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file) : wxInputStream()
{ {
unz_file_info zinfo; unz_file_info zinfo;
@@ -37,17 +33,21 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
m_Pos = 0; m_Pos = 0;
m_Size = 0; m_Size = 0;
m_Archive = (void*) unzOpen(archive); m_Archive = (void*) unzOpen(archive);
if (m_Archive == NULL) { if (m_Archive == NULL)
{
m_lasterror = wxStream_READ_ERR; m_lasterror = wxStream_READ_ERR;
return; return;
} }
if (unzLocateFile((unzFile)m_Archive, file, 0) != UNZ_OK) { if (unzLocateFile((unzFile)m_Archive, file, 0) != UNZ_OK)
{
m_lasterror = wxStream_READ_ERR; m_lasterror = wxStream_READ_ERR;
return; return;
} }
unzGetCurrentFileInfo((unzFile)m_Archive, &zinfo, NULL, 0, NULL, 0, NULL, 0);
unzGetCurrentFileInfo((unzFile)m_Archive, &zinfo, (char*) NULL, 0, (void*) NULL, 0, (char*) NULL, 0);
if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK) { if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
{
m_lasterror = wxStream_READ_ERR; m_lasterror = wxStream_READ_ERR;
return; return;
} }
@@ -58,7 +58,8 @@ wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file
wxZipInputStream::~wxZipInputStream() wxZipInputStream::~wxZipInputStream()
{ {
if (m_Archive) { if (m_Archive)
{
if (m_Size != 0) if (m_Size != 0)
unzCloseCurrentFile((unzFile)m_Archive); unzCloseCurrentFile((unzFile)m_Archive);
unzClose((unzFile)m_Archive); unzClose((unzFile)m_Archive);
@@ -82,7 +83,8 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
off_t nextpos; off_t nextpos;
void *buf; void *buf;
switch (mode) { switch (mode)
{
case wxFromCurrent : nextpos = seek + m_Pos; break; case wxFromCurrent : nextpos = seek + m_Pos; break;
case wxFromStart : nextpos = seek; break; case wxFromStart : nextpos = seek; break;
case wxFromEnd : nextpos = m_Size - 1 + seek; break; case wxFromEnd : nextpos = m_Size - 1 + seek; break;
@@ -90,14 +92,16 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
} }
// cheated seeking : // cheated seeking :
if (nextpos > m_Pos) { if (nextpos > m_Pos)
{
buf = malloc(nextpos - m_Pos); buf = malloc(nextpos - m_Pos);
unzReadCurrentFile((unzFile)m_Archive, buf, nextpos - m_Pos); unzReadCurrentFile((unzFile)m_Archive, buf, nextpos - m_Pos);
free(buf); free(buf);
} }
else if (nextpos < m_Pos) { else if (nextpos < m_Pos) {
unzCloseCurrentFile((unzFile)m_Archive); unzCloseCurrentFile((unzFile)m_Archive);
if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK) { if (unzOpenCurrentFile((unzFile)m_Archive) != UNZ_OK)
{
m_lasterror = wxStream_READ_ERR; m_lasterror = wxStream_READ_ERR;
return m_Pos; return m_Pos;
} }
@@ -111,3 +115,4 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
} }
#endif #endif
// wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB

14
src/common/zstream.cpp
View File

@@ -20,17 +20,21 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
#endif
#if wxUSE_ZLIB && wxUSE_STREAMS #if wxUSE_ZLIB && wxUSE_STREAMS
#include "wx/zstream.h" #include "wx/zstream.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "../zlib/zlib.h"
// When using configure, the path must be "zlib.h" I don't know
// what other ports (wxMac, wxMotif without configure) need here.
#ifdef __WXMSW__
#include "..\zlib\zlib.h"
#else
#include "zlib.h"
#endif
#define ZSTREAM_BUFFER_SIZE 1024 #define ZSTREAM_BUFFER_SIZE 1024

40
src/generic/busyinfo.cpp
View File

@@ -7,58 +7,48 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation #pragma implementation "busyinfo.h"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORDLANDC__ #ifdef __BORDLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WXPRECOMP
#include <wx/wx.h>
#endif
#if wxUSE_BUSYINFO #if wxUSE_BUSYINFO
#include "wx/busyinfo.h" #include "wx/busyinfo.h"
#include "wx/stattext.h"
#include "wx/panel.h"
#include "wx/utils.h"
wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
: wxFrame(parent, -1, "", wxPoint(0, 0), wxSize(400, 80), wxTHICK_FRAME | wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW) : wxFrame(parent, -1, "", wxPoint(0, 0), wxSize(400, 80), wxTHICK_FRAME | wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW)
{ {
wxPanel *p = new wxPanel(this); wxPanel *p = new wxPanel( this );
wxStaticText *s = new wxStaticText(p, -1, message, wxPoint(20, 20), wxSize(360, 40), wxALIGN_CENTER); wxStaticText *s = new wxStaticText( p, -1, message, wxPoint(20, 20), wxSize(360, 40), wxALIGN_CENTER );
Centre(wxBOTH); Centre(wxBOTH);
p -> SetCursor(*wxHOURGLASS_CURSOR); p->SetCursor(*wxHOURGLASS_CURSOR);
s -> SetCursor(*wxHOURGLASS_CURSOR); s->SetCursor(*wxHOURGLASS_CURSOR);
} }
wxBusyInfo::wxBusyInfo(const wxString& message) : wxObject() wxBusyInfo::wxBusyInfo(const wxString& message) : wxObject()
{ {
m_InfoFrame = new wxInfoFrame(NULL, message); m_InfoFrame = new wxInfoFrame( (wxWindow*) NULL, message);
m_InfoFrame -> Show(TRUE); m_InfoFrame->Show(TRUE);
wxYield(); wxYield();
m_InfoFrame -> Refresh(); m_InfoFrame->Refresh();
wxYield(); wxYield();
} }
wxBusyInfo::~wxBusyInfo() wxBusyInfo::~wxBusyInfo()
{ {
m_InfoFrame -> Show(FALSE); m_InfoFrame->Show(FALSE);
m_InfoFrame -> Close(); m_InfoFrame->Close();
wxYield(); wxYield();
} }
#endif #endif
// wxUSE_BUSYINFO

12
src/gtk/bmpbuttn.cpp
View File

@@ -148,14 +148,14 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
gtk_widget_show( pixmap ); gtk_widget_show( pixmap );
gtk_container_add( GTK_CONTAINER(m_widget), 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_connect( GTK_OBJECT(m_widget), "clicked",
GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this ); GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this );

6
src/gtk/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 ); page->m_box = gtk_hbox_new( FALSE, 0 );
gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 ); 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) if (position < 0)
gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
else 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; 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 */ /* set the label image */
page->m_image = imageId; page->m_image = imageId;

5
src/gtk/win_gtk.c
View File

@@ -10,6 +10,7 @@
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h" #include "gtk/gtksignal.h"
#include "gtk/gtknotebook.h" #include "gtk/gtknotebook.h"
#include "gtk/gtktable.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -327,7 +328,9 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed,
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (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.x = child->x;
child_allocation.y = child->y; child_allocation.y = child->y;

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_widget_show( pixmap );
gtk_container_add( GTK_CONTAINER(m_widget), 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_connect( GTK_OBJECT(m_widget), "clicked",
GTK_SIGNAL_FUNC(gtk_bmpbutton_clicked_callback), (gpointer*)this ); 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 ); page->m_box = gtk_hbox_new( FALSE, 0 );
gtk_container_border_width( GTK_CONTAINER(page->m_box), 2 ); 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) if (position < 0)
gtk_notebook_append_page( notebook, win->m_widget, page->m_box ); gtk_notebook_append_page( notebook, win->m_widget, page->m_box );
else 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; 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 */ /* set the label image */
page->m_image = imageId; page->m_image = imageId;

5
src/gtk1/win_gtk.c
View File

@@ -10,6 +10,7 @@
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
#include "gtk/gtksignal.h" #include "gtk/gtksignal.h"
#include "gtk/gtknotebook.h" #include "gtk/gtknotebook.h"
#include "gtk/gtktable.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -327,7 +328,9 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed,
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (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.x = child->x;
child_allocation.y = child->y; child_allocation.y = child->y;