Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upported a number of patches to HEAD.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-09-09 18:04:57 +00:00
parent 69b5cec2b0
commit a1696b86f8
5 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/generic/fontdlgg.cpp
View File

@@ -348,6 +348,7 @@ void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event))
{ {
m_fontData.m_fontColour = *col; m_fontData.m_fontColour = *col;
m_previewer->SetForegroundColour(*col); m_previewer->SetForegroundColour(*col);
delete col;
} }
} }
m_previewer->Refresh(); m_previewer->Refresh();

6
src/gtk/dataobj.cpp
View File

@@ -202,8 +202,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const
for (size_t i = 0; i < m_filenames.GetCount(); i++) for (size_t i = 0; i < m_filenames.GetCount(); i++)
{ {
filenames += wxT("file:");
filenames += m_filenames[i]; filenames += m_filenames[i];
filenames += (wxChar) 0; filenames += wxT("\r\n");
} }
memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 ); memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
@@ -217,8 +218,9 @@ size_t wxFileDataObject::GetDataSize() const
for (size_t i = 0; i < m_filenames.GetCount(); i++) for (size_t i = 0; i < m_filenames.GetCount(); i++)
{ {
// This is junk in UTF-8
res += m_filenames[i].Len(); res += m_filenames[i].Len();
res += 1; res += 5 + 2; // "file:" (5) + "\r\n" (2)
} }
return res + 1; return res + 1;

14
src/gtk/window.cpp
View File

@@ -517,7 +517,7 @@ static int gtk_window_expose_callback( GtkWidget *widget,
GtkPizza *pizza = GTK_PIZZA( widget ); GtkPizza *pizza = GTK_PIZZA( widget );
if (gdk_event->window != pizza->bin_window) return FALSE; if (gdk_event->window != pizza->bin_window) return FALSE;
#if 0 #if 1
if (win->GetName()) if (win->GetName())
{ {
wxPrintf( wxT("OnExpose from ") ); wxPrintf( wxT("OnExpose from ") );
@@ -528,6 +528,18 @@ static int gtk_window_expose_callback( GtkWidget *widget,
(int)gdk_event->area.width, (int)gdk_event->area.width,
(int)gdk_event->area.height ); (int)gdk_event->area.height );
} }
gtk_paint_box
(
win->m_wxwindow->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
(GdkRectangle*) NULL,
win->m_wxwindow,
(char *)"button", // const_cast
20,20,24,24
);
#endif #endif
win->GetUpdateRegion() = wxRegion( gdk_event->region ); win->GetUpdateRegion() = wxRegion( gdk_event->region );

6
src/gtk1/dataobj.cpp
View File

@@ -202,8 +202,9 @@ bool wxFileDataObject::GetDataHere(void *buf) const
for (size_t i = 0; i < m_filenames.GetCount(); i++) for (size_t i = 0; i < m_filenames.GetCount(); i++)
{ {
filenames += wxT("file:");
filenames += m_filenames[i]; filenames += m_filenames[i];
filenames += (wxChar) 0; filenames += wxT("\r\n");
} }
memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 ); memcpy( buf, filenames.mbc_str(), filenames.Len() + 1 );
@@ -217,8 +218,9 @@ size_t wxFileDataObject::GetDataSize() const
for (size_t i = 0; i < m_filenames.GetCount(); i++) for (size_t i = 0; i < m_filenames.GetCount(); i++)
{ {
// This is junk in UTF-8
res += m_filenames[i].Len(); res += m_filenames[i].Len();
res += 1; res += 5 + 2; // "file:" (5) + "\r\n" (2)
} }
return res + 1; return res + 1;

14
src/gtk1/window.cpp
View File

@@ -517,7 +517,7 @@ static int gtk_window_expose_callback( GtkWidget *widget,
GtkPizza *pizza = GTK_PIZZA( widget ); GtkPizza *pizza = GTK_PIZZA( widget );
if (gdk_event->window != pizza->bin_window) return FALSE; if (gdk_event->window != pizza->bin_window) return FALSE;
#if 0 #if 1
if (win->GetName()) if (win->GetName())
{ {
wxPrintf( wxT("OnExpose from ") ); wxPrintf( wxT("OnExpose from ") );
@@ -528,6 +528,18 @@ static int gtk_window_expose_callback( GtkWidget *widget,
(int)gdk_event->area.width, (int)gdk_event->area.width,
(int)gdk_event->area.height ); (int)gdk_event->area.height );
} }
gtk_paint_box
(
win->m_wxwindow->style,
pizza->bin_window,
GTK_STATE_NORMAL,
GTK_SHADOW_OUT,
(GdkRectangle*) NULL,
win->m_wxwindow,
(char *)"button", // const_cast
20,20,24,24
);
#endif #endif
win->GetUpdateRegion() = wxRegion( gdk_event->region ); win->GetUpdateRegion() = wxRegion( gdk_event->region );