Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 57952 Details for
Bug 71086
wx.NET (New package)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch from upstream fixing problems with wxGTK-2.6.0
wxGTK-2.6.0-compat.patch (text/plain), 16.54 KB, created by
Terry L. Triplett
on 2005-05-03 12:40:41 UTC
(
hide
)
Description:
patch from upstream fixing problems with wxGTK-2.6.0
Filename:
MIME Type:
Creator:
Terry L. Triplett
Created:
2005-05-03 12:40:41 UTC
Size:
16.54 KB
patch
obsolete
>diff -uNr wx.NET-0.6.1.old/Samples/Controls/Controls.cs wx.NET-0.6.1/Samples/Controls/Controls.cs >--- wx.NET-0.6.1.old/Samples/Controls/Controls.cs 2004-12-06 12:00:42.000000000 -0500 >+++ wx.NET-0.6.1/Samples/Controls/Controls.cs 2005-05-03 13:47:14.000000000 -0400 >@@ -11,7 +11,7 @@ > // (C) 2003 Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: Controls.cs,v 1.36 2004/12/06 17:00:42 olkalex Exp $ >+// $Id: Controls.cs,v 1.37 2005/04/21 18:04:08 olkalex Exp $ > //----------------------------------------------------------------------------- > > using System; >@@ -125,7 +125,7 @@ > { > panel.text.Clear(); > } >- >+ > //--------------------------------------------------------------------- > > public void OnAbout(object sender, Event e) >@@ -314,12 +314,24 @@ > ImageList imagelist = new ImageList(16, 16, false, > (int)Images.Max); > >- imagelist.Add(new wx.Bitmap(imgPath + "list.xpm")); >- imagelist.Add(new wx.Bitmap(imgPath + "choice.xpm")); >- imagelist.Add(new wx.Bitmap(imgPath + "combo.xpm")); >- imagelist.Add(new wx.Bitmap(imgPath + "text.xpm")); >- imagelist.Add(new wx.Bitmap(imgPath + "radio.xpm")); >- imagelist.Add(new wx.Bitmap(imgPath + "gauge.xpm")); >+ wx.Bitmap bmp = new wx.Bitmap(); >+ bmp.LoadFile(imgPath + "list.xpm", BitmapType.wxBITMAP_TYPE_XPM); >+ imagelist.Add(bmp); >+ bmp = new wx.Bitmap(); >+ bmp.LoadFile(imgPath + "choice.xpm", BitmapType.wxBITMAP_TYPE_XPM); >+ imagelist.Add(bmp); >+ bmp = new wx.Bitmap(); >+ bmp.LoadFile(imgPath + "combo.xpm", BitmapType.wxBITMAP_TYPE_XPM); >+ imagelist.Add(bmp); >+ bmp = new wx.Bitmap(); >+ bmp.LoadFile(imgPath + "text.xpm", BitmapType.wxBITMAP_TYPE_XPM); >+ imagelist.Add(bmp); >+ bmp = new wx.Bitmap(); >+ bmp.LoadFile(imgPath + "radio.xpm", BitmapType.wxBITMAP_TYPE_XPM); >+ imagelist.Add(bmp); >+ bmp = new wx.Bitmap(); >+ bmp.LoadFile(imgPath + "gauge.xpm", BitmapType.wxBITMAP_TYPE_XPM); >+ imagelist.Add(bmp); > > notebook.Images = imagelist; > >@@ -327,6 +339,7 @@ > > // wxListBox sample panel > Panel panel = new Panel(notebook); >+ > notebook.AddPage(panel, "wxListBox", true, (int)Images.List); > > listbox = new ListBox(panel, ID_LISTBOX, >diff -uNr wx.NET-0.6.1.old/Samples/Mdi/Mdi.cs wx.NET-0.6.1/Samples/Mdi/Mdi.cs >--- wx.NET-0.6.1.old/Samples/Mdi/Mdi.cs 2004-12-06 12:00:43.000000000 -0500 >+++ wx.NET-0.6.1/Samples/Mdi/Mdi.cs 2005-05-03 13:47:51.000000000 -0400 >@@ -139,14 +139,22 @@ > { > wx.Bitmap[] bitmaps = new wx.Bitmap[8]; > >- bitmaps[0] = new wx.Bitmap( "../Samples/Mdi/bitmaps/new.xpm" ); >- bitmaps[1] = new wx.Bitmap( "../Samples/Mdi/bitmaps/open.xpm" ); >- bitmaps[2] = new wx.Bitmap( "../Samples/Mdi/bitmaps/save.xpm" ); >- bitmaps[3] = new wx.Bitmap( "../Samples/Mdi/bitmaps/copy.xpm" ); >- bitmaps[4] = new wx.Bitmap( "../Samples/Mdi/bitmaps/cut.xpm" ); >- bitmaps[5] = new wx.Bitmap( "../Samples/Mdi/bitmaps/paste.xpm" ); >- bitmaps[6] = new wx.Bitmap( "../Samples/Mdi/bitmaps/print.xpm" ); >- bitmaps[7] = new wx.Bitmap( "../Samples/Mdi/bitmaps/help.xpm" ); >+ bitmaps[0] = new wx.Bitmap(); >+ bitmaps[0].LoadFile( "../Samples/Mdi/bitmaps/new.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[1] = new wx.Bitmap(); >+ bitmaps[1].LoadFile( "../Samples/Mdi/bitmaps/open.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[2] = new wx.Bitmap(); >+ bitmaps[2].LoadFile( "../Samples/Mdi/bitmaps/save.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[3] = new wx.Bitmap(); >+ bitmaps[3].LoadFile( "../Samples/Mdi/bitmaps/copy.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[4] = new wx.Bitmap(); >+ bitmaps[4].LoadFile( "../Samples/Mdi/bitmaps/cut.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[5] = new wx.Bitmap(); >+ bitmaps[5].LoadFile( "../Samples/Mdi/bitmaps/paste.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[6] = new wx.Bitmap(); >+ bitmaps[6].LoadFile( "../Samples/Mdi/bitmaps/print.xpm", BitmapType.wxBITMAP_TYPE_XPM ); >+ bitmaps[7] = new wx.Bitmap(); >+ bitmaps[7].LoadFile( "../Samples/Mdi/bitmaps/help.xpm", BitmapType.wxBITMAP_TYPE_XPM ); > > int width = 24; > int currentX = 5; >diff -uNr wx.NET-0.6.1.old/Src/wx-c/bitmapbutton.cxx wx.NET-0.6.1/Src/wx-c/bitmapbutton.cxx >--- wx.NET-0.6.1.old/Src/wx-c/bitmapbutton.cxx 2004-11-26 16:39:50.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx-c/bitmapbutton.cxx 2005-05-03 13:49:46.000000000 -0400 >@@ -3,7 +3,7 @@ > // > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: bitmapbutton.cxx,v 1.12 2004/11/26 21:39:50 olkalex Exp $ >+// $Id: bitmapbutton.cxx,v 1.13 2005/04/21 16:57:08 olkalex Exp $ > //----------------------------------------------------------------------------- > > #include <wx/wx.h> >@@ -206,8 +206,8 @@ > > //----------------------------------------------------------------------------- > >-extern "C" WXEXPORT >+/*extern "C" WXEXPORT > void wxBitmapButton_ApplyParentThemeBackground(_BitmapButton* self, wxColour* colour) > { > self->ApplyParentThemeBackground(*colour); >-} >+}*/ >diff -uNr wx.NET-0.6.1.old/Src/wx-c/document.cxx wx.NET-0.6.1/Src/wx-c/document.cxx >--- wx.NET-0.6.1.old/Src/wx-c/document.cxx 2004-02-27 22:13:39.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx-c/document.cxx 2005-05-03 13:48:46.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 by Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: document.cxx,v 1.5 2004/02/28 03:13:39 malenfant Exp $ >+// $Id: document.cxx,v 1.6 2005/04/21 16:57:17 olkalex Exp $ > //----------------------------------------------------------------------------- > > #include <wx/wx.h> >@@ -119,7 +119,7 @@ > > //----------------------------------------------------------------------------- > >-extern "C" WXEXPORT >+/*extern "C" WXEXPORT > wxOutputStream* wxDocument_SaveObject(wxDocument* self, wxOutputStream* stream) > { > return &(self->SaveObject(*stream)); >@@ -129,7 +129,7 @@ > wxInputStream* wxDocument_LoadObject(wxDocument* self, wxInputStream* stream) > { > return &(self->LoadObject(*stream)); >-} >+}*/ > > //----------------------------------------------------------------------------- > >diff -uNr wx.NET-0.6.1.old/Src/wx-c/html.cxx wx.NET-0.6.1/Src/wx-c/html.cxx >--- wx.NET-0.6.1.old/Src/wx-c/html.cxx 2004-11-25 15:50:10.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx-c/html.cxx 2005-05-03 13:49:06.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 by Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: html.cxx,v 1.15 2004/11/25 20:50:10 olkalex Exp $ >+// $Id: html.cxx,v 1.16 2005/04/21 16:57:17 olkalex Exp $ > //----------------------------------------------------------------------------- > > #include <wx/wx.h> >@@ -1913,11 +1913,11 @@ > > //----------------------------------------------------------------------------- > >-extern "C" WXEXPORT >+/*extern "C" WXEXPORT > void wxHtmlEasyPrinting_PrinterSetup(wxHtmlEasyPrinting* self) > { > self->PrinterSetup(); >-} >+}*/ > > //----------------------------------------------------------------------------- > >diff -uNr wx.NET-0.6.1.old/Src/wx-c/printdialog.cxx wx.NET-0.6.1/Src/wx-c/printdialog.cxx >--- wx.NET-0.6.1.old/Src/wx-c/printdialog.cxx 2004-11-13 13:25:33.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx-c/printdialog.cxx 2005-05-03 13:49:21.000000000 -0400 >@@ -7,13 +7,14 @@ > // (C) 2003 by Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: printdialog.cxx,v 1.7 2004/11/13 18:25:33 olkalex Exp $ >+// $Id: printdialog.cxx,v 1.8 2005/04/21 16:57:17 olkalex Exp $ > //----------------------------------------------------------------------------- > > #include <wx/wx.h> > #include <wx/printdlg.h> >-#include "local_events.h" >+//#include "local_events.h" > >+/* > class _PageSetupDialog : public wxPageSetupDialog > { > public: >@@ -21,14 +22,14 @@ > : wxPageSetupDialog(parent, data) {} > > DECLARE_OBJECTDELETED(_PageSetupDialog) >-}; >+};*/ > > //----------------------------------------------------------------------------- > > extern "C" WXEXPORT > wxPageSetupDialog* wxPageSetupDialog_ctor(wxWindow* parent, wxPageSetupData* data) > { >- return new _PageSetupDialog(parent, data); >+ return new wxPageSetupDialog(parent, data); > } > > //----------------------------------------------------------------------------- >@@ -42,19 +43,19 @@ > //----------------------------------------------------------------------------- > // wxPrintDialog > >-class _PrintDialog : public wxPrintDialog >+/*class _PrintDialog : public wxPrintDialog > { > public: > _PrintDialog(wxWindow* parent, wxPrintDialogData* data) > : wxPrintDialog(parent, data) {} > > DECLARE_OBJECTDELETED(_PrintDialog) >-}; >+};*/ > > extern "C" WXEXPORT > wxPrintDialog* wxPrintDialog_ctor(wxWindow* parent, wxPrintDialogData* data) > { >- return new _PrintDialog(parent, data); >+ return new wxPrintDialog(parent, data); > } > > //----------------------------------------------------------------------------- >diff -uNr wx.NET-0.6.1.old/Src/wx-c/styledtextctrl.cxx wx.NET-0.6.1/Src/wx-c/styledtextctrl.cxx >--- wx.NET-0.6.1.old/Src/wx-c/styledtextctrl.cxx 2004-09-24 14:17:42.000000000 -0400 >+++ wx.NET-0.6.1/Src/wx-c/styledtextctrl.cxx 2005-05-03 13:48:34.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 by Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: styledtextctrl.cxx,v 1.9 2004/09/24 18:17:42 olkalex Exp $ >+// $Id: styledtextctrl.cxx,v 1.10 2005/04/21 16:57:18 olkalex Exp $ > //----------------------------------------------------------------------------- > > #ifdef WXNET_STYLEDTEXTCTRL >@@ -1973,9 +1973,9 @@ > //----------------------------------------------------------------------------- > > extern "C" WXEXPORT >-void wxStyledTextCtrl_AppendText(wxStyledTextCtrl* self, int length, char* text) >+void wxStyledTextCtrl_AppendText(wxStyledTextCtrl* self, char* text) > { >- self->AppendText(length, wxString(text, wxConvUTF8)); >+ self->AppendText(wxString(text, wxConvUTF8)); > } > > //----------------------------------------------------------------------------- >diff -uNr wx.NET-0.6.1.old/Src/wx.NET/BitmapButton.cs wx.NET-0.6.1/Src/wx.NET/BitmapButton.cs >--- wx.NET-0.6.1.old/Src/wx.NET/BitmapButton.cs 2004-11-26 16:39:51.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx.NET/BitmapButton.cs 2005-05-03 13:50:30.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 Robert Roebling > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: BitmapButton.cs,v 1.14 2004/11/26 21:39:51 olkalex Exp $ >+// $Id: BitmapButton.cs,v 1.15 2005/04/21 16:57:18 olkalex Exp $ > //----------------------------------------------------------------------------- > > using System; >@@ -45,7 +45,7 @@ > > [DllImport("wx-c")] static extern void wxBitmapButton_OnSetBitmap(IntPtr self); > >- [DllImport("wx-c")] static extern void wxBitmapButton_ApplyParentThemeBackground(IntPtr self, IntPtr colour); >+ //[DllImport("wx-c")] static extern void wxBitmapButton_ApplyParentThemeBackground(IntPtr self, IntPtr colour); > > //--------------------------------------------------------------------- > >@@ -192,9 +192,9 @@ > > //--------------------------------------------------------------------- > >- public virtual void ApplyParentThemeBackground(Colour bg) >+ /*public virtual void ApplyParentThemeBackground(Colour bg) > { > wxBitmapButton_ApplyParentThemeBackground(wxObject, Object.SafePtr(bg)); >- } >+ }*/ > } > } >diff -uNr wx.NET-0.6.1.old/Src/wx.NET/Document.cs wx.NET-0.6.1/Src/wx.NET/Document.cs >--- wx.NET-0.6.1.old/Src/wx.NET/Document.cs 2004-11-24 15:47:43.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx.NET/Document.cs 2005-05-03 13:50:47.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: Document.cs,v 1.5 2004/11/24 20:47:43 olkalex Exp $ >+// $Id: Document.cs,v 1.6 2005/04/21 16:57:18 olkalex Exp $ > //----------------------------------------------------------------------------- > > #if NOT_READY_YET >@@ -33,8 +33,8 @@ > [DllImport("wx-c")] static extern bool wxDocument_Save(IntPtr self); > [DllImport("wx-c")] static extern bool wxDocument_SaveAs(IntPtr self); > [DllImport("wx-c")] static extern bool wxDocument_Revert(IntPtr self); >- [DllImport("wx-c")] static extern IntPtr wxDocument_SaveObject(IntPtr self, IntPtr stream); >- [DllImport("wx-c")] static extern IntPtr wxDocument_LoadObject(IntPtr self, IntPtr stream); >+ //[DllImport("wx-c")] static extern IntPtr wxDocument_SaveObject(IntPtr self, IntPtr stream); >+ //[DllImport("wx-c")] static extern IntPtr wxDocument_LoadObject(IntPtr self, IntPtr stream); > [DllImport("wx-c")] static extern IntPtr wxDocument_GetCommandProcessor(IntPtr self); > [DllImport("wx-c")] static extern void wxDocument_SetCommandProcessor(IntPtr self, IntPtr proc); > [DllImport("wx-c")] static extern bool wxDocument_DeleteContents(IntPtr self); >diff -uNr wx.NET-0.6.1.old/Src/wx.NET/HTML.cs wx.NET-0.6.1/Src/wx.NET/HTML.cs >--- wx.NET-0.6.1.old/Src/wx.NET/HTML.cs 2004-11-26 16:39:52.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx.NET/HTML.cs 2005-05-03 13:51:05.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: HTML.cs,v 1.18 2004/11/26 21:39:52 olkalex Exp $ >+// $Id: HTML.cs,v 1.19 2005/04/21 16:57:18 olkalex Exp $ > //----------------------------------------------------------------------------- > > using System; >@@ -1979,7 +1979,7 @@ > [DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PreviewText(IntPtr self, string htmltext, string basepath); > [DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PrintFile(IntPtr self, string htmlfile); > [DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PrintText(IntPtr self, string htmltext, string basepath); >- [DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PrinterSetup(IntPtr self); >+ //[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PrinterSetup(IntPtr self); > [DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PageSetup(IntPtr self); > [DllImport("wx-c")] static extern void wxHtmlEasyPrinting_SetHeader(IntPtr self, string header, int pg); > [DllImport("wx-c")] static extern void wxHtmlEasyPrinting_SetFooter(IntPtr self, string footer, int pg); >@@ -2042,10 +2042,10 @@ > > //----------------------------------------------------------------------------- > >- public void PrinterSetup() >+ /*public void PrinterSetup() > { > wxHtmlEasyPrinting_PrinterSetup(wxObject); >- } >+ }*/ > > //----------------------------------------------------------------------------- > >diff -uNr wx.NET-0.6.1.old/Src/wx.NET/StyledTextCtrl.cs wx.NET-0.6.1/Src/wx.NET/StyledTextCtrl.cs >--- wx.NET-0.6.1.old/Src/wx.NET/StyledTextCtrl.cs 2004-12-13 12:03:54.000000000 -0500 >+++ wx.NET-0.6.1/Src/wx.NET/StyledTextCtrl.cs 2005-05-03 13:50:16.000000000 -0400 >@@ -7,7 +7,7 @@ > // (C) 2003 Bryan Bulten > // Licensed under the wxWidgets license, see LICENSE.txt for details. > // >-// $Id: StyledTextCtrl.cs,v 1.17 2004/12/13 17:03:54 olkalex Exp $ >+// $Id: StyledTextCtrl.cs,v 1.18 2005/04/21 16:57:19 olkalex Exp $ > //----------------------------------------------------------------------------- > > #if WXNET_STYLEDTEXTCTRL >@@ -1289,7 +1289,7 @@ > [DllImport("wx-c")] static extern int wxStyledTextCtrl_TextHeight(IntPtr self, int line); > [DllImport("wx-c")] static extern void wxStyledTextCtrl_SetUseVerticalScrollBar(IntPtr self, bool show); > [DllImport("wx-c")] static extern bool wxStyledTextCtrl_GetUseVerticalScrollBar(IntPtr self); >- [DllImport("wx-c")] static extern void wxStyledTextCtrl_AppendText(IntPtr self, int length, string text); >+ [DllImport("wx-c")] static extern void wxStyledTextCtrl_AppendText(IntPtr self, string text); > [DllImport("wx-c")] static extern bool wxStyledTextCtrl_GetTwoPhaseDraw(IntPtr self); > [DllImport("wx-c")] static extern void wxStyledTextCtrl_SetTwoPhaseDraw(IntPtr self, bool twoPhase); > [DllImport("wx-c")] static extern void wxStyledTextCtrl_TargetFromSelection(IntPtr self); >@@ -2673,9 +2673,14 @@ > > public void AppendText(int length, string text) > { >- wxStyledTextCtrl_AppendText(wxObject, length, text); >+ AppendText(text); > } > >+ public void AppendText(string text) >+ { >+ wxStyledTextCtrl_AppendText(wxObject, text); >+ } >+ > //----------------------------------------------------------------------------- > > public bool TwoPhaseDraw
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=57952">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 71086
:
43879
|
43880
|
43909
|
45185
|
49777
|
49778
| 57952 |
64047
|
64048
|
64380
|
64381
|
80164
|
80166
|
80167
|
80168
|
80174
|
80207
|
80208
|
141145
|
141147
