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
This commit is contained in:
@@ -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 );
|
||||
|
@@ -158,6 +158,8 @@ void wxEndBusyCursor()
|
||||
|
||||
wxSetCursor( gs_savedCursor );
|
||||
gs_savedCursor = wxNullCursor;
|
||||
|
||||
wxYield();
|
||||
}
|
||||
|
||||
void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
|
||||
|
@@ -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 );
|
||||
|
@@ -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 );
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -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 );
|
||||
|
Reference in New Issue
Block a user