Applied patch for multiple file selection, documented.
Fixed some compilation warnings, Minor change to OpenGL code. Documented wxImageHandler::GetImageCount() and related. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -226,12 +226,25 @@ void wxapp_install_idle_handler()
|
||||
{
|
||||
wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
|
||||
|
||||
/* this routine gets called by all event handlers
|
||||
indicating that the idle is over. */
|
||||
/* This routine gets called by all event handlers
|
||||
indicating that the idle is over. It may also
|
||||
get called from other thread for sending events
|
||||
to the main thread (and processing these in
|
||||
idle time). */
|
||||
|
||||
#if wxUSE_THREADS
|
||||
if (!wxThread::IsMain())
|
||||
GDK_THREADS_ENTER ();
|
||||
#endif
|
||||
|
||||
wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
|
||||
|
||||
g_isIdle = FALSE;
|
||||
|
||||
#if wxUSE_THREADS
|
||||
if (!wxThread::IsMain())
|
||||
GDK_THREADS_LEAVE ();
|
||||
#endif
|
||||
}
|
||||
|
||||
#if wxUSE_THREADS
|
||||
|
@@ -204,7 +204,7 @@ size_t wxFileDataObject::GetDataSize() const
|
||||
return res + 1;
|
||||
}
|
||||
|
||||
bool wxFileDataObject::SetData(size_t size, const void *buf)
|
||||
bool wxFileDataObject::SetData(size_t WXUNUSED(size), const void *buf)
|
||||
{
|
||||
// VZ: old format
|
||||
#if 0
|
||||
|
@@ -188,7 +188,7 @@ wxFont::wxFont( const wxString& fontname, const wxFontData& fontdata )
|
||||
|
||||
tmp = tn.GetNextToken(); // pointsize
|
||||
long num = wxStrtol (tmp.c_str(), (wxChar **) NULL, 10);
|
||||
M_FONTDATA->m_pointSize = num / 10;
|
||||
M_FONTDATA->m_pointSize = (int)(num / 10);
|
||||
|
||||
tn.GetNextToken(); // x-res
|
||||
tn.GetNextToken(); // y-res
|
||||
|
@@ -48,7 +48,7 @@ extern wxList wxPendingDelete;
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
static void
|
||||
gtk_mdi_page_change_callback( GtkNotebook *widget,
|
||||
gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
|
||||
GtkNotebookPage *page,
|
||||
gint WXUNUSED(page_num),
|
||||
wxMDIParentFrame *parent )
|
||||
|
@@ -179,7 +179,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
|
||||
GDK_BUTTON1_MOTION_MASK),
|
||||
(GdkWindow *) NULL,
|
||||
(GdkCursor *) NULL,
|
||||
GDK_CURRENT_TIME );
|
||||
(unsigned int) GDK_CURRENT_TIME );
|
||||
|
||||
win->m_diffX = (int)gdk_event->x;
|
||||
win->m_diffY = (int)gdk_event->y;
|
||||
|
@@ -201,7 +201,7 @@ gtk_pizza_new ()
|
||||
return GTK_WIDGET (pizza);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
gtk_pizza_scroll_set_adjustments (GtkPizza *pizza,
|
||||
GtkAdjustment *hadj,
|
||||
GtkAdjustment *vadj)
|
||||
|
Reference in New Issue
Block a user