From a7ac4461ab64212a536a8dabffc2ad65ef573a5f Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Thu, 18 Feb 1999 14:04:46 +0000
Subject: [PATCH] Dialog items inherit parent's font now Augmented beta to
5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
docs/bugs.txt | 5 ++++-
docs/gtk/readme.txt | 2 +-
include/wx/version.h | 2 +-
samples/controls/controls.cpp | 7 +++----
src/gtk/button.cpp | 1 +
src/gtk/checkbox.cpp | 1 +
src/gtk/choice.cpp | 1 +
src/gtk/combobox.cpp | 1 +
src/gtk/listbox.cpp | 1 +
src/gtk/radiobox.cpp | 1 +
src/gtk/radiobut.cpp | 1 +
src/gtk/statbox.cpp | 1 +
src/gtk/stattext.cpp | 1 +
src/gtk1/button.cpp | 1 +
src/gtk1/checkbox.cpp | 1 +
src/gtk1/choice.cpp | 1 +
src/gtk1/combobox.cpp | 1 +
src/gtk1/listbox.cpp | 1 +
src/gtk1/radiobox.cpp | 1 +
src/gtk1/radiobut.cpp | 1 +
src/gtk1/statbox.cpp | 1 +
src/gtk1/stattext.cpp | 1 +
wxGTK.spec | 4 ++--
23 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/docs/bugs.txt b/docs/bugs.txt
index 7a00fc64b3..e65b274512 100644
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -4,7 +4,10 @@ wxWindows Buglist
wxGTK:
------
-- TODO
+- It is impossible to reposition a window before showing it
+ on screen. Suspected GTK bug.
+
+- DnD does only moderately work.
wxMSW:
------
diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 25c561571b..ab707deb85 100644
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,5 +1,5 @@
- Welcome to wxWindows/Gtk 2.01 (beta 4),
+ Welcome to wxWindows/Gtk 2.01 (beta 5),
you have downloaded version 2.01 of the GTK+ 1.0 port of
the wxWindows GUI library.
diff --git a/include/wx/version.h b/include/wx/version.h
index 155118e34e..276361a46e 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -18,7 +18,7 @@
#define wxRELEASE_NUMBER 1
#define wxVERSION_STRING "wxWindows 2.0.1"
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER 4
+#define wxBETA_NUMBER 5
#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
#endif
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 5d08805027..124bb0aa4e 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -489,10 +489,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
(void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", wxPoint(345, 0), wxSize(160, 100) );
(void)new wxButton( panel, ID_MOVE_END_ENTRY, "Text &entry", wxPoint(370, 20), wxSize(110, 30) );
(void)new wxButton( panel, ID_MOVE_END_ZONE, "Text &zone", wxPoint(370, 60), wxSize(110, 30) );
- (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,110), wxSize(160,100) );
- (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(375,130), wxSize(110,30) );
- (new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(375,170), wxSize(110,30) ))
- ->SetDefault();
+ (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,100), wxSize(160,100) );
+ (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(370,120), wxSize(110,30) );
+ (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(370,160), wxSize(110,30) );
m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text );
wxString choices2[] =
diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 42716b5b40..af6d56d598 100644
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -89,6 +89,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index c3fa1a8749..8c4fbbfaf9 100644
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -90,6 +90,7 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 27ba2fa798..9bf71e04f5 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -96,6 +96,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 7fd217fda3..ad273a35ea 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -134,6 +134,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 5028599776..9650f43753 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -288,6 +288,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 846ec6c3b2..f17e532c56 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -121,6 +121,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index abf7ac99f2..b1dd17479f 100644
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -90,6 +90,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index e5239cc924..2bef390337 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -55,6 +55,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b1f31084a5..9026c416b5 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -72,6 +72,7 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 42716b5b40..af6d56d598 100644
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -89,6 +89,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index c3fa1a8749..8c4fbbfaf9 100644
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -90,6 +90,7 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 27ba2fa798..9bf71e04f5 100644
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -96,6 +96,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 7fd217fda3..ad273a35ea 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -134,6 +134,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 5028599776..9650f43753 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -288,6 +288,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 846ec6c3b2..f17e532c56 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -121,6 +121,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index abf7ac99f2..b1dd17479f 100644
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -90,6 +90,7 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index e5239cc924..2bef390337 100644
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -55,6 +55,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index b1f31084a5..9026c416b5 100644
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -72,6 +72,7 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
+ SetFont( parent->GetFont() );
Show( TRUE );
diff --git a/wxGTK.spec b/wxGTK.spec
index 2485a714d5..7ab6526c1e 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,10 +1,10 @@
Summary: The GTK+ 1.0 port of wxWindows library
Name: wxGTK
-Version: 1.99.4
+Version: 1.99.5
Release: 1
Copyright: wxWindows Licence
Group: X11/Libraries
-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK2b4.tgz
+Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK2b5.tgz
URL: http://www.freiburg.linux.de/~wxxt/docs.html
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
Requires: gtk+ >= 1.0.4
--
2.47.2