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

diff --git a/docs/bugs.txt b/docs/bugs.txt
index 7a00fc64b312a994381f58ee4fcda972fd19059f..e65b2745127c374b7fa4ee26535359986405f346 100644 (file)
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -4,7 +4,10 @@ wxWindows Buglist
 wxGTK:
 ------
 
 wxGTK:
 ------
 

-- TODO
+- It is impossible to reposition a window before showing it
+  on screen. Suspected GTK bug.
+  
+- DnD does only moderately work.

 
 wxMSW:
 ------
 
 wxMSW:
 ------

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 25c561571bd80074e23052e4645b44801c32c2f2..ab707deb85c3730e28f39ad70a9560d67c567426 100644 (file)
--- 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.
 
 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 155118e34e19a0437408b6933601f0f9cf234c90..276361a46e7f86404d709503b64e25c5beba83ca 100644 (file)
--- 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 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
 #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 5d0880502799cdecefa7e588bf7eeac4fee64230..124bb0aa4e2afe3ba89ad856da7bec40efa17fbd 100644 (file)
--- 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, "&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[] =
   m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text );
 
   wxString choices2[] =

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 42716b5b40dfd88bb7d36aea4fbc15c5f7dc8bdf..af6d56d5982f01b14c4cf4af6be0643791f55b42 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index c3fa1a8749cd2c29a0427a2689e7bb3f9c4e5f3d..8c4fbbfaf956be6c7fa9794dc1c1bff6045d3274 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 27ba2fa798c98c1cfa41fb4fcfc01641521935ef..9bf71e04f573542025511715fd2f2c91485dedae 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
     
 
     Show( TRUE );
     

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 7fd217fda342388270ff71edad84f80c775622e2..ad273a35ea41074b4ade1b3e7cb614ea5abaec8c 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 5028599776cd4bc74e3ab73377b37a40ce23e471..9650f43753d637b02ee87ab3611e4e4c1d664158 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 846ec6c3b2ed27c47b7f0636b61270ce1708f3ee..f17e532c5674fd95ae994f60a9951af3a40cba7c 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
     
 
     Show( TRUE );
     

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index abf7ac99f298ec6cd79ce5850d3db2e60c96f7c8..b1dd17479f95d444cc87e1db543ffb16e2fcf311 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

   
     Show( TRUE );
 
   
     Show( TRUE );
 

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index e5239cc9243669fe0d94f0245bc88a6528daf6bf..2bef39033731f9383cf3fdf6fa7754dff9eb8a66 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b1f31084a56e3d833e5c06d226a1efc6ffbb7d42..9026c416b59dbcb2b9d4ad352c43760c08586869 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
     
 
     Show( TRUE );
     

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 42716b5b40dfd88bb7d36aea4fbc15c5f7dc8bdf..af6d56d5982f01b14c4cf4af6be0643791f55b42 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index c3fa1a8749cd2c29a0427a2689e7bb3f9c4e5f3d..8c4fbbfaf956be6c7fa9794dc1c1bff6045d3274 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 27ba2fa798c98c1cfa41fb4fcfc01641521935ef..9bf71e04f573542025511715fd2f2c91485dedae 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
     
 
     Show( TRUE );
     

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 7fd217fda342388270ff71edad84f80c775622e2..ad273a35ea41074b4ade1b3e7cb614ea5abaec8c 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 5028599776cd4bc74e3ab73377b37a40ce23e471..9650f43753d637b02ee87ab3611e4e4c1d664158 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 846ec6c3b2ed27c47b7f0636b61270ce1708f3ee..f17e532c5674fd95ae994f60a9951af3a40cba7c 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
     
 
     Show( TRUE );
     

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index abf7ac99f298ec6cd79ce5850d3db2e60c96f7c8..b1dd17479f95d444cc87e1db543ffb16e2fcf311 100644 (file)
--- 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() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

   
     Show( TRUE );
 
   
     Show( TRUE );
 

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index e5239cc9243669fe0d94f0245bc88a6528daf6bf..2bef39033731f9383cf3fdf6fa7754dff9eb8a66 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index b1f31084a56e3d833e5c06d226a1efc6ffbb7d42..9026c416b59dbcb2b9d4ad352c43760c08586869 100644 (file)
--- 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() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
     
 
     Show( TRUE );
     

diff --git a/wxGTK.spec b/wxGTK.spec
index 2485a714d51a63d7970b5a9eac5dbf2ba23c23cb..7ab6526c1e8f2e60f00cbf8b77e47be96a28bbbc 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,10 +1,10 @@
 Summary: The GTK+ 1.0 port of wxWindows library
 Name: wxGTK
 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
 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
 URL: http://www.freiburg.linux.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.0.4