From 0544bc0aab888b4e064de10e451a4fa94ba0f33a Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 25 Jul 1999 17:11:17 +0000 Subject: [PATCH] Distrib things Corrected wxPrivateDataObject a little Corrected wxRadioButton Corrected wrong defines of wxRadioBox styles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/gtk/changes.txt | 42 +++++++++++++++++++++++++++++++++++ docs/gtk/install.txt | 13 ++++++++++- docs/gtk/readme.txt | 2 +- docs/msw/install.txt | 26 ++++++++++++++++++++++ include/wx/dataobj.h | 2 ++ include/wx/defs.h | 14 ++++++------ samples/controls/controls.cpp | 2 +- src/gtk/radiobut.cpp | 20 ++++++++--------- src/gtk1/radiobut.cpp | 20 ++++++++--------- wxGTK.spec | 2 +- wxMotif.spec | 2 +- wxWINE.spec | 2 +- 12 files changed, 114 insertions(+), 33 deletions(-) diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt index 03e7fa7bb1..7be7e77d72 100644 --- a/docs/gtk/changes.txt +++ b/docs/gtk/changes.txt @@ -1,4 +1,46 @@ +27th July '99: Eight wxGTK 2.1 snapshot released + +The new makefile system is not able to produce shared libraries +on Unix with the exception of Linux - libtool is really great... + +Work in wxPen, wxBrush and wxDC to match wxMSW more exactly and +to implement missing feature etc. + +Reimplemented radio buttons. The first of a group of such buttons +is now marked by having the wxRB_GROUP style. + +Complete redesign of all stream classes, including tests for them +in the samples. + +Controls now send the same messages (or more importantly none if +changed programmatically) as per wxMSW. + +New implementation of wxSocket using an intermediate library called +GSocket. This willl hopefully change in the future. + +Reworked in-place editing of wxListCtrl and wxTreeCtrl. + +Fixed bug reporting two refreshes when scrolling. + +Disabled GUI threading as I have not been able to get this working +correctly in _all_ circumstances. + +Corrected bug in wxComboBox client data code. + +Corrected reported but unverified bug in BMP loading code. + +Added a few more methods to wxStaticBitmap. + +Integration of wxHTML code in the main library, including wxZIPStream, +wxFilesystem, wxHTMLHelpController and others. + +Added a wrapper for ffile() etc functions. + +New documentation. + +Fixed in unenclosed number of other bugs... + 25th June '99: Seventh wxGTK 2.1 snapshot released Many fixes to th new makefile system. The last version gave diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 263feec3ba..cbc7f33ed8 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -6,7 +6,7 @@ * The most simple case ----------------------- -If you compile wxWindows on Unix for the first time and don't like to read +If you compile wxWindows on Linux for the first time and don't like to read install instructions just do (in the base dir): ./configure @@ -16,6 +16,17 @@ make install ldconfig exit +On all other Unices (maybe except *BSD), shared libraries are not supported +out of the box due to the utter stupidity of libtool, so you'll have to do +this instead: + +./configure --enable-static --disable-shared +make +su +make install +ldconfig +exit + If you want to remove wxWindows on Unix you can do this: su diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt index 1b8b5e5df2..3d7eeeebef 100644 --- a/docs/gtk/readme.txt +++ b/docs/gtk/readme.txt @@ -1,5 +1,5 @@ - Welcome to wxWindows/Gtk 2.1 snapshot 7, + Welcome to wxWindows/Gtk 2.1 snapshot 8, you have downloaded version 2.1 of the GTK+ 1.2 port of the wxWindows GUI library. This is a developers release diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 31a1b1d2db..ebfd849c7c 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,4 +1,30 @@ +Installing wxWindows 2.1 +------------------------ + +[Notes from Robert Roebling for snapshot 8] + +This is a not-so-well tested snapshot release of wxWindows 2.1 for +Microsoft Windows 95, 98 and NT. This is not a production release, +although a huge number of bugs found in wxWindows 2.0 have been +fixed. + +There have not been major changes in the way to build the library, +although the creation of the various makefiles has been automatized. +I myself use the GNU MingGW32 compiler from + + http://www.cygnus.com + +using the GNU make program from + + http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32 + +and I have not tested any other compiler, but other developers use +the makefiles for Borland C++, MS-Visual C++ 5.0 and 6.0 and probably +Metrowerks C++. + +Expect problems. + Installing wxWindows 2.0 ------------------------ diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index b109dc64fe..3e1df6d487 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -85,8 +85,10 @@ private: size_t m_size; void *m_data; +#if !defined(__WXGTK__) && !defined(__WXMOTIF__) // the data format wxDataFormat m_format; +#endif }; diff --git a/include/wx/defs.h b/include/wx/defs.h index 4b150036b4..f2449d0911 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -706,18 +706,18 @@ enum #define wxCB_DROPDOWN 0x0020 /* - * wxRadioBox/wxRadioButton style flags + * wxRadioBox style flags */ - // New, more intuitive names to specify majorDim argument -// Same as wxRA_HORIZONTAL -#define wxRA_SPECIFY_COLS 0x0001 -// Same as wxRA_VERTICAL -#define wxRA_SPECIFY_ROWS 0x0002 - +#define wxRA_SPECIFY_COLS wxHORIZONTAL +#define wxRA_SPECIFY_ROWS wxVERTICAL // Old names for compatibility #define wxRA_HORIZONTAL wxHORIZONTAL #define wxRA_VERTICAL wxVERTICAL + +/* + * wxRadioButton style flag + */ #define wxRB_GROUP 0x0004 /* diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 4b010ed6f3..39651183ae 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -427,7 +427,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) ); (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) ); (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) ); - wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30) ); + wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP ); rb->SetValue( FALSE ); (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) ); m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 294820894f..3550885060 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -93,18 +93,18 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab chief = (wxRadioButton*) child; if (child->HasFlag(wxRB_GROUP)) break; } - if (chief) - { - /* we are part of the group started by chief */ - m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); - } - else - { - /* start a new group */ - m_radioButtonGroup = (GSList*) NULL; - } node = node->GetPrevious(); } + if (chief) + { + /* we are part of the group started by chief */ + m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); + } + else + { + /* start a new group */ + m_radioButtonGroup = (GSList*) NULL; + } } m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() ); diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index 294820894f..3550885060 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -93,18 +93,18 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab chief = (wxRadioButton*) child; if (child->HasFlag(wxRB_GROUP)) break; } - if (chief) - { - /* we are part of the group started by chief */ - m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); - } - else - { - /* start a new group */ - m_radioButtonGroup = (GSList*) NULL; - } node = node->GetPrevious(); } + if (chief) + { + /* we are part of the group started by chief */ + m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); + } + else + { + /* start a new group */ + m_radioButtonGroup = (GSList*) NULL; + } } m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() ); diff --git a/wxGTK.spec b/wxGTK.spec index aea4a5ab4b..2f490b78d4 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,7 +1,7 @@ # Note that this is NOT a relocatable package %define pref /usr %define ver 2.1.0 -%define rel 7 +%define rel 8 Summary: The GTK+ 1.2 port of the wxWindows library Name: wxGTK diff --git a/wxMotif.spec b/wxMotif.spec index 1ebe0e1bb1..4f248f85c7 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,7 +1,7 @@ # Note that this is NOT a relocatable package %define pref /usr %define ver 2.1.0 -%define rel 7 +%define rel 8 Summary: The Motif port of the wxWindows library Name: wxMotif diff --git a/wxWINE.spec b/wxWINE.spec index e4d8bc78d1..0aca200369 100644 --- a/wxWINE.spec +++ b/wxWINE.spec @@ -1,7 +1,7 @@ # Note that this is NOT a relocatable package %define pref /usr %define ver 2.1.0 -%define rel 7 +%define rel 8 Summary: The WINE port of the wxWindows library Name: wxWINE -- 2.47.2