Minor changes to viusal appearance,

  Added wxYield() to wxEndBusyCursor(),
  Made wxSpinButton always sent a wxSROLL_THUMBTRACK event,
  Made wxDirDialog resizable,
  Made gsocket.c compile,

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 78c674dee3a70976d0a01ec1d4e93a1a8e3baeb1..27f1baa1285cc7f4efc0ee9cbc89ed09c9e81f7e 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -442,7 +442,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     (void)new wxStaticText( panel, -1,
                             "Drag the slider!",
                             wxPoint(228,30),
-                            wxSize(230, -1)
+                            wxSize(240, -1)
                           );
 #else
     (void)new wxStaticText( panel, -1,
@@ -453,7 +453,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                             "This is also supposed to demonstrate how\n"
                             "to use static controls.\n",
                            wxPoint(228,25),
-                           wxSize(230, 110)
+                           wxSize(240, 110)
                           );
 #endif
     m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 2ecea4a565c5708da73c2017a51bb470b59d388d..b5bd0ccfc88031ead7f702f88f728aa9d02a152d 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -240,8 +240,10 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) )
 {
-    long res = wxGetNumberFromUser("", "Enter a number:", "Numeric input test",
-                                   50, 0, 100, this);
+    long res = wxGetNumberFromUser( "This is some text, actually a lot of text.\n"
+                                    "Even two rows of text.",
+                                   "Enter a number:", "Numeric input test",
+                                     50, 0, 100, this );
 
     wxString msg;
     int icon;

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index fa4ca908b1f3a67b7213ccb407d12ff14ba13eb7..f43ff6f7b545545b3e1d0c0eb52cddf6cdb7cba0 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -330,7 +330,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
                         const wxString& defaultPath, long style, 
                         const wxPoint& pos) : 
   wxDialog(parent, -1, message, pos, wxSize(300,300),
-          wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+          wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
   m_message = message;
   m_dialogStyle = style;

diff --git a/src/gtk/choicdlg.cpp b/src/gtk/choicdlg.cpp
index 806b21e46da86f12e783e912a9f43380a9d7ac69..903e1009d8b178fa138857932490050ebe1d938f 100644 (file)
--- a/src/gtk/choicdlg.cpp
+++ b/src/gtk/choicdlg.cpp
@@ -297,7 +297,8 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m
     }
     
 #if wxUSE_STATLINE
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+    int edge_margin = 7;
+    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
 #endif
     
     SetSize( w+30, y+40 );

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 4876e3f8d3fa12d0334a90f38cc8e1626111c423..7a47bd6bd9752f6ed0c2b3b8a967c36eb7de895d 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -158,6 +158,8 @@ void wxEndBusyCursor()
 
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
+    
+    wxYield();
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )

diff --git a/src/gtk/msgdlg.cpp b/src/gtk/msgdlg.cpp
index c1d4f486e9c4c4072c7ef7f212ce93c83eedb1f6..212f62da5ac387239835cf11ec33cd782b27d0bb 100644 (file)
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -165,7 +165,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
     }
     
 #ifdef __WXGTK__
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+    int edge_margin = 7;
+    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
 #endif
     
     SetSize( w+30, y+40 );

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index e4ef0744ed0a6392a402629b274f8a6eb1b4d705..898eb4f4b935bce55eaa5aa3ad19c09de99503f4 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -55,12 +55,9 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     wxEventType command = wxEVT_NULL;
 
     float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
 
     if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
     else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);
@@ -68,8 +65,17 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     event.SetEventObject( win );
-
     win->GetEventHandler()->ProcessEvent( event );
+    
+    /* always send a thumbtrack event */
+    if (command != wxEVT_SCROLL_THUMBTRACK)
+    {
+        command = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( command, win->GetId());
+        event2.SetPosition( value );
+        event2.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event2 );
+    }
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/textdlg.cpp b/src/gtk/textdlg.cpp
index 5ffe1cafdcdfdfe351db5abf8cd43774fe3b16f7..a0267ad3f94f2b9b4580b07a0e4bc257442ed4b5 100644 (file)
--- a/src/gtk/textdlg.cpp
+++ b/src/gtk/textdlg.cpp
@@ -140,7 +140,8 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message,
     }
     
 #if wxUSE_STATLINE
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+    int edge_margin = 7;
+    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
 #endif
     
     SetSize( w+30, y+40 );

diff --git a/src/gtk1/choicdlg.cpp b/src/gtk1/choicdlg.cpp
index 806b21e46da86f12e783e912a9f43380a9d7ac69..903e1009d8b178fa138857932490050ebe1d938f 100644 (file)
--- a/src/gtk1/choicdlg.cpp
+++ b/src/gtk1/choicdlg.cpp
@@ -297,7 +297,8 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m
     }
     
 #if wxUSE_STATLINE
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+    int edge_margin = 7;
+    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
 #endif
     
     SetSize( w+30, y+40 );

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 4876e3f8d3fa12d0334a90f38cc8e1626111c423..7a47bd6bd9752f6ed0c2b3b8a967c36eb7de895d 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -158,6 +158,8 @@ void wxEndBusyCursor()
 
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
+    
+    wxYield();
 }
 
 void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )

diff --git a/src/gtk1/msgdlg.cpp b/src/gtk1/msgdlg.cpp
index c1d4f486e9c4c4072c7ef7f212ce93c83eedb1f6..212f62da5ac387239835cf11ec33cd782b27d0bb 100644 (file)
--- a/src/gtk1/msgdlg.cpp
+++ b/src/gtk1/msgdlg.cpp
@@ -165,7 +165,8 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString
     }
     
 #ifdef __WXGTK__
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+    int edge_margin = 7;
+    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
 #endif
     
     SetSize( w+30, y+40 );

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index e4ef0744ed0a6392a402629b274f8a6eb1b4d705..898eb4f4b935bce55eaa5aa3ad19c09de99503f4 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -55,12 +55,9 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     wxEventType command = wxEVT_NULL;
 
     float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
 
     if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
     else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);
@@ -68,8 +65,17 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     event.SetEventObject( win );
-
     win->GetEventHandler()->ProcessEvent( event );
+    
+    /* always send a thumbtrack event */
+    if (command != wxEVT_SCROLL_THUMBTRACK)
+    {
+        command = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( command, win->GetId());
+        event2.SetPosition( value );
+        event2.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event2 );
+    }
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/textdlg.cpp b/src/gtk1/textdlg.cpp
index 5ffe1cafdcdfdfe351db5abf8cd43774fe3b16f7..a0267ad3f94f2b9b4580b07a0e4bc257442ed4b5 100644 (file)
--- a/src/gtk1/textdlg.cpp
+++ b/src/gtk1/textdlg.cpp
@@ -140,7 +140,8 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message,
     }
     
 #if wxUSE_STATLINE
-    (void) new wxStaticLine( this, -1, wxPoint(0,y-20), wxSize(w+30, 5) );
+    int edge_margin = 7;
+    (void) new wxStaticLine( this, -1, wxPoint(edge_margin,y-20), wxSize(w+30-2*edge_margin, 5) );
 #endif
     
     SetSize( w+30, y+40 );

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index aa3f28ae855141d06b00356e161d24eb7d471efd..19a802d0cfa9f27799627ccea30332e596753ad2 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -487,7 +487,7 @@ bool GSocket_DataAvailable(GSocket *socket)
   GSocket_SetNonBlocking() puts the socket in non-blocking mode. This is useful
   if we don't want to wait.
 */
-void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
+void GSocket_SetNonBlocking(GSocket *socket, bool block)
 {
   assert(socket != NULL);
 
@@ -501,7 +501,7 @@ void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
  * GSocket_SetTimeout()
  */
 
-#ifndef LINUX
+#if !defined(__LINUX__) && !defined(__FREEBSD__)
 #   define CAN_USE_TIMEOUT
 #elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 #   if (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 1)