Attachment #57952 for bug #71086




// (C) 2003 Bryan Bulten
// Licensed under the wxWidgets license, see LICENSE.txt for details.
//
// $Id: Controls.cs,v 1.37 2005/04/21 18:04:08 olkalex Exp $
//-----------------------------------------------------------------------------

using System;

        {
            panel.text.Clear();
        }
   
        //---------------------------------------------------------------------

        public void OnAbout(object sender, Event e)

            ImageList imagelist = new ImageList(16, 16, false,
                                                (int)Images.Max);

            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;



            // wxListBox sample panel
            Panel panel = new Panel(notebook);

            notebook.AddPage(panel, "wxListBox", true, (int)Images.List);

            listbox = new ListBox(panel, ID_LISTBOX,




		{
			wx.Bitmap[] bitmaps = new wx.Bitmap[8];
			
			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;

Lines 3-9 Link Here

(-)wx.NET-0.6.1.old/Src/wx-c/bitmapbutton.cxx (-3 / +3 lines)
3	//	3	//
4	// Licensed under the wxWidgets license, see LICENSE.txt for details.	4	// Licensed under the wxWidgets license, see LICENSE.txt for details.
5	//	5	//
6	// $Id: bitmapbutton.cxx,v 1.12 2004/11/26 21:39:50 olkalex Exp $	6	// $Id: bitmapbutton.cxx,v 1.13 2005/04/21 16:57:08 olkalex Exp $
7	//-----------------------------------------------------------------------------	7	//-----------------------------------------------------------------------------
8		8
9	#include <wx/wx.h>	9	#include <wx/wx.h>
Lines 206-213 Link Here
206		206
207	//-----------------------------------------------------------------------------	207	//-----------------------------------------------------------------------------
208		208
209	extern "C" WXEXPORT	209	/*extern "C" WXEXPORT
210	void wxBitmapButton_ApplyParentThemeBackground(_BitmapButton* self, wxColour* colour)	210	void wxBitmapButton_ApplyParentThemeBackground(_BitmapButton* self, wxColour* colour)
211	{	211	{
212	self->ApplyParentThemeBackground(*colour);	212	self->ApplyParentThemeBackground(*colour);
213	}	213	}*/

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx-c/document.cxx (-3 / +3 lines)
7	// (C) 2003 by Bryan Bulten	7	// (C) 2003 by Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: document.cxx,v 1.5 2004/02/28 03:13:39 malenfant Exp $	10	// $Id: document.cxx,v 1.6 2005/04/21 16:57:17 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#include <wx/wx.h>	13	#include <wx/wx.h>
Lines 119-125 Link Here
119		119
120	//-----------------------------------------------------------------------------	120	//-----------------------------------------------------------------------------
121		121
122	extern "C" WXEXPORT	122	/*extern "C" WXEXPORT
123	wxOutputStream* wxDocument_SaveObject(wxDocument* self, wxOutputStream* stream)	123	wxOutputStream* wxDocument_SaveObject(wxDocument* self, wxOutputStream* stream)
124	{	124	{
125	return &(self->SaveObject(*stream));	125	return &(self->SaveObject(*stream));
Lines 129-135 Link Here
129	wxInputStream* wxDocument_LoadObject(wxDocument* self, wxInputStream* stream)	129	wxInputStream* wxDocument_LoadObject(wxDocument* self, wxInputStream* stream)
130	{	130	{
131	return &(self->LoadObject(*stream));	131	return &(self->LoadObject(*stream));
132	}	132	}*/
133		133
134	//-----------------------------------------------------------------------------	134	//-----------------------------------------------------------------------------
135		135

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx-c/html.cxx (-3 / +3 lines)
7	// (C) 2003 by Bryan Bulten	7	// (C) 2003 by Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: html.cxx,v 1.15 2004/11/25 20:50:10 olkalex Exp $	10	// $Id: html.cxx,v 1.16 2005/04/21 16:57:17 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#include <wx/wx.h>	13	#include <wx/wx.h>
Lines 1913-1923 Link Here
1913		1913
1914	//-----------------------------------------------------------------------------	1914	//-----------------------------------------------------------------------------
1915		1915
1916	extern "C" WXEXPORT	1916	/*extern "C" WXEXPORT
1917	void wxHtmlEasyPrinting_PrinterSetup(wxHtmlEasyPrinting* self)	1917	void wxHtmlEasyPrinting_PrinterSetup(wxHtmlEasyPrinting* self)
1918	{	1918	{
1919	self->PrinterSetup();	1919	self->PrinterSetup();
1920	}	1920	}*/
1921		1921
1922	//-----------------------------------------------------------------------------	1922	//-----------------------------------------------------------------------------
1923		1923




// (C) 2003 by Bryan Bulten
// Licensed under the wxWidgets license, see LICENSE.txt for details.
//
// $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"

/*
class _PageSetupDialog : public wxPageSetupDialog 
{
public:

		: wxPageSetupDialog(parent, data) {}

	DECLARE_OBJECTDELETED(_PageSetupDialog)
};*/

//-----------------------------------------------------------------------------

extern "C" WXEXPORT
wxPageSetupDialog* wxPageSetupDialog_ctor(wxWindow* parent, wxPageSetupData* data)
{
    return new wxPageSetupDialog(parent, data);
}

//-----------------------------------------------------------------------------

//-----------------------------------------------------------------------------
// 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 wxPrintDialog(parent, data);
}

//-----------------------------------------------------------------------------

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx-c/styledtextctrl.cxx (-3 / +3 lines)
7	// (C) 2003 by Bryan Bulten	7	// (C) 2003 by Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: styledtextctrl.cxx,v 1.9 2004/09/24 18:17:42 olkalex Exp $	10	// $Id: styledtextctrl.cxx,v 1.10 2005/04/21 16:57:18 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#ifdef WXNET_STYLEDTEXTCTRL	13	#ifdef WXNET_STYLEDTEXTCTRL
Lines 1973-1981 Link Here
1973	//-----------------------------------------------------------------------------	1973	//-----------------------------------------------------------------------------
1974		1974
1975	extern "C" WXEXPORT	1975	extern "C" WXEXPORT
1976	void wxStyledTextCtrl_AppendText(wxStyledTextCtrl* self, int length, char* text)	1976	void wxStyledTextCtrl_AppendText(wxStyledTextCtrl* self, char* text)
1977	{	1977	{
1978	self->AppendText(length, wxString(text, wxConvUTF8));	1978	self->AppendText(wxString(text, wxConvUTF8));
1979	}	1979	}
1980		1980
1981	//-----------------------------------------------------------------------------	1981	//-----------------------------------------------------------------------------




// (C) 2003 Robert Roebling
// Licensed under the wxWidgets license, see LICENSE.txt for details.
//
// $Id: BitmapButton.cs,v 1.15 2005/04/21 16:57:18 olkalex Exp $
//-----------------------------------------------------------------------------

using System;

		
		[DllImport("wx-c")] static extern void wxBitmapButton_OnSetBitmap(IntPtr self);
		
		//[DllImport("wx-c")] static extern void wxBitmapButton_ApplyParentThemeBackground(IntPtr self, IntPtr colour);

		//---------------------------------------------------------------------
		

		
		//---------------------------------------------------------------------
		
		/*public virtual void ApplyParentThemeBackground(Colour bg)
		{
			wxBitmapButton_ApplyParentThemeBackground(wxObject, Object.SafePtr(bg));
		}*/
	}
}




// (C) 2003 Bryan Bulten
// Licensed under the wxWidgets license, see LICENSE.txt for details.
//
// $Id: HTML.cs,v 1.19 2005/04/21 16:57:18 olkalex Exp $
//-----------------------------------------------------------------------------

using System;

		[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_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);

		
		//-----------------------------------------------------------------------------
		
		/*public void PrinterSetup()
		{
			wxHtmlEasyPrinting_PrinterSetup(wxObject);
		}*/
		
		//-----------------------------------------------------------------------------
		




// (C) 2003 Bryan Bulten
// Licensed under the wxWidgets license, see LICENSE.txt for details.
//
// $Id: StyledTextCtrl.cs,v 1.18 2005/04/21 16:57:19 olkalex Exp $
//-----------------------------------------------------------------------------

#if WXNET_STYLEDTEXTCTRL

        [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, 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);


        public void AppendText(int length, string text)
        {
            	AppendText(text);
        }

	public void AppendText(string text)
	{
		wxStyledTextCtrl_AppendText(wxObject, text);
	}

        //-----------------------------------------------------------------------------

        public bool TwoPhaseDraw

Return to bug 71086

Lines 139-152 Link Here

(-)wx.NET-0.6.1.old/Samples/Mdi/Mdi.cs (-8 / +16 lines)
139	{	139	{
140	wx.Bitmap[] bitmaps = new wx.Bitmap[8];	140	wx.Bitmap[] bitmaps = new wx.Bitmap[8];
141		141
142	bitmaps[0] = new wx.Bitmap( "../Samples/Mdi/bitmaps/new.xpm" );	142	bitmaps[0] = new wx.Bitmap();
143	bitmaps[1] = new wx.Bitmap( "../Samples/Mdi/bitmaps/open.xpm" );	143	bitmaps[0].LoadFile( "../Samples/Mdi/bitmaps/new.xpm", BitmapType.wxBITMAP_TYPE_XPM );
144	bitmaps[2] = new wx.Bitmap( "../Samples/Mdi/bitmaps/save.xpm" );	144	bitmaps[1] = new wx.Bitmap();
145	bitmaps[3] = new wx.Bitmap( "../Samples/Mdi/bitmaps/copy.xpm" );	145	bitmaps[1].LoadFile( "../Samples/Mdi/bitmaps/open.xpm", BitmapType.wxBITMAP_TYPE_XPM );
146	bitmaps[4] = new wx.Bitmap( "../Samples/Mdi/bitmaps/cut.xpm" );	146	bitmaps[2] = new wx.Bitmap();
147	bitmaps[5] = new wx.Bitmap( "../Samples/Mdi/bitmaps/paste.xpm" );	147	bitmaps[2].LoadFile( "../Samples/Mdi/bitmaps/save.xpm", BitmapType.wxBITMAP_TYPE_XPM );
148	bitmaps[6] = new wx.Bitmap( "../Samples/Mdi/bitmaps/print.xpm" );	148	bitmaps[3] = new wx.Bitmap();
149	bitmaps[7] = new wx.Bitmap( "../Samples/Mdi/bitmaps/help.xpm" );	149	bitmaps[3].LoadFile( "../Samples/Mdi/bitmaps/copy.xpm", BitmapType.wxBITMAP_TYPE_XPM );
		150	bitmaps[4] = new wx.Bitmap();
		151	bitmaps[4].LoadFile( "../Samples/Mdi/bitmaps/cut.xpm", BitmapType.wxBITMAP_TYPE_XPM );
		152	bitmaps[5] = new wx.Bitmap();
		153	bitmaps[5].LoadFile( "../Samples/Mdi/bitmaps/paste.xpm", BitmapType.wxBITMAP_TYPE_XPM );
		154	bitmaps[6] = new wx.Bitmap();
		155	bitmaps[6].LoadFile( "../Samples/Mdi/bitmaps/print.xpm", BitmapType.wxBITMAP_TYPE_XPM );
		156	bitmaps[7] = new wx.Bitmap();
		157	bitmaps[7].LoadFile( "../Samples/Mdi/bitmaps/help.xpm", BitmapType.wxBITMAP_TYPE_XPM );
150		158
151	int width = 24;	159	int width = 24;
152	int currentX = 5;	160	int currentX = 5;

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx.NET/StyledTextCtrl.cs (-3 / +8 lines)
7	// (C) 2003 Bryan Bulten	7	// (C) 2003 Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: StyledTextCtrl.cs,v 1.17 2004/12/13 17:03:54 olkalex Exp $	10	// $Id: StyledTextCtrl.cs,v 1.18 2005/04/21 16:57:19 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#if WXNET_STYLEDTEXTCTRL	13	#if WXNET_STYLEDTEXTCTRL
Lines 1289-1295 Link Here
1289	[DllImport("wx-c")] static extern int wxStyledTextCtrl_TextHeight(IntPtr self, int line);	1289	[DllImport("wx-c")] static extern int wxStyledTextCtrl_TextHeight(IntPtr self, int line);
1290	[DllImport("wx-c")] static extern void wxStyledTextCtrl_SetUseVerticalScrollBar(IntPtr self, bool show);	1290	[DllImport("wx-c")] static extern void wxStyledTextCtrl_SetUseVerticalScrollBar(IntPtr self, bool show);
1291	[DllImport("wx-c")] static extern bool wxStyledTextCtrl_GetUseVerticalScrollBar(IntPtr self);	1291	[DllImport("wx-c")] static extern bool wxStyledTextCtrl_GetUseVerticalScrollBar(IntPtr self);
1292	[DllImport("wx-c")] static extern void wxStyledTextCtrl_AppendText(IntPtr self, int length, string text);	1292	[DllImport("wx-c")] static extern void wxStyledTextCtrl_AppendText(IntPtr self, string text);
1293	[DllImport("wx-c")] static extern bool wxStyledTextCtrl_GetTwoPhaseDraw(IntPtr self);	1293	[DllImport("wx-c")] static extern bool wxStyledTextCtrl_GetTwoPhaseDraw(IntPtr self);
1294	[DllImport("wx-c")] static extern void wxStyledTextCtrl_SetTwoPhaseDraw(IntPtr self, bool twoPhase);	1294	[DllImport("wx-c")] static extern void wxStyledTextCtrl_SetTwoPhaseDraw(IntPtr self, bool twoPhase);
1295	[DllImport("wx-c")] static extern void wxStyledTextCtrl_TargetFromSelection(IntPtr self);	1295	[DllImport("wx-c")] static extern void wxStyledTextCtrl_TargetFromSelection(IntPtr self);
Lines 2673-2681 Link Here
2673		2673
2674	public void AppendText(int length, string text)	2674	public void AppendText(int length, string text)
2675	{	2675	{
2676	wxStyledTextCtrl_AppendText(wxObject, length, text);	2676	AppendText(text);
2677	}	2677	}
2678		2678
		2679	public void AppendText(string text)
		2680	{
		2681	wxStyledTextCtrl_AppendText(wxObject, text);
		2682	}
		2683
2679	//-----------------------------------------------------------------------------	2684	//-----------------------------------------------------------------------------
2680		2685
2681	public bool TwoPhaseDraw	2686	public bool TwoPhaseDraw

Lines 11-17 Link Here

(-)wx.NET-0.6.1.old/Samples/Controls/Controls.cs (-8 / +21 lines)
11	// (C) 2003 Bryan Bulten	11	// (C) 2003 Bryan Bulten
12	// Licensed under the wxWidgets license, see LICENSE.txt for details.	12	// Licensed under the wxWidgets license, see LICENSE.txt for details.
13	//	13	//
14	// $Id: Controls.cs,v 1.36 2004/12/06 17:00:42 olkalex Exp $	14	// $Id: Controls.cs,v 1.37 2005/04/21 18:04:08 olkalex Exp $
15	//-----------------------------------------------------------------------------	15	//-----------------------------------------------------------------------------
16		16
17	using System;	17	using System;
Lines 125-131 Link Here
125	{	125	{
126	panel.text.Clear();	126	panel.text.Clear();
127	}	127	}
128		128
129	//---------------------------------------------------------------------	129	//---------------------------------------------------------------------
130		130
131	public void OnAbout(object sender, Event e)	131	public void OnAbout(object sender, Event e)
Lines 314-325 Link Here
314	ImageList imagelist = new ImageList(16, 16, false,	314	ImageList imagelist = new ImageList(16, 16, false,
315	(int)Images.Max);	315	(int)Images.Max);
316		316
317	imagelist.Add(new wx.Bitmap(imgPath + "list.xpm"));	317	wx.Bitmap bmp = new wx.Bitmap();
318	imagelist.Add(new wx.Bitmap(imgPath + "choice.xpm"));	318	bmp.LoadFile(imgPath + "list.xpm", BitmapType.wxBITMAP_TYPE_XPM);
319	imagelist.Add(new wx.Bitmap(imgPath + "combo.xpm"));	319	imagelist.Add(bmp);
320	imagelist.Add(new wx.Bitmap(imgPath + "text.xpm"));	320	bmp = new wx.Bitmap();
321	imagelist.Add(new wx.Bitmap(imgPath + "radio.xpm"));	321	bmp.LoadFile(imgPath + "choice.xpm", BitmapType.wxBITMAP_TYPE_XPM);
322	imagelist.Add(new wx.Bitmap(imgPath + "gauge.xpm"));	322	imagelist.Add(bmp);
		323	bmp = new wx.Bitmap();
		324	bmp.LoadFile(imgPath + "combo.xpm", BitmapType.wxBITMAP_TYPE_XPM);
		325	imagelist.Add(bmp);
		326	bmp = new wx.Bitmap();
		327	bmp.LoadFile(imgPath + "text.xpm", BitmapType.wxBITMAP_TYPE_XPM);
		328	imagelist.Add(bmp);
		329	bmp = new wx.Bitmap();
		330	bmp.LoadFile(imgPath + "radio.xpm", BitmapType.wxBITMAP_TYPE_XPM);
		331	imagelist.Add(bmp);
		332	bmp = new wx.Bitmap();
		333	bmp.LoadFile(imgPath + "gauge.xpm", BitmapType.wxBITMAP_TYPE_XPM);
		334	imagelist.Add(bmp);
323		335
324	notebook.Images = imagelist;	336	notebook.Images = imagelist;
325		337
Lines 327-332 Link Here
327		339
328	// wxListBox sample panel	340	// wxListBox sample panel
329	Panel panel = new Panel(notebook);	341	Panel panel = new Panel(notebook);
		342
330	notebook.AddPage(panel, "wxListBox", true, (int)Images.List);	343	notebook.AddPage(panel, "wxListBox", true, (int)Images.List);
331		344
332	listbox = new ListBox(panel, ID_LISTBOX,	345	listbox = new ListBox(panel, ID_LISTBOX,

Lines 7-19 Link Here

(-)wx.NET-0.6.1.old/Src/wx-c/printdialog.cxx (-7 / +8 lines)
7	// (C) 2003 by Bryan Bulten	7	// (C) 2003 by Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: printdialog.cxx,v 1.7 2004/11/13 18:25:33 olkalex Exp $	10	// $Id: printdialog.cxx,v 1.8 2005/04/21 16:57:17 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#include <wx/wx.h>	13	#include <wx/wx.h>
14	#include <wx/printdlg.h>	14	#include <wx/printdlg.h>
15	#include "local_events.h"	15	//#include "local_events.h"
16		16
		17	/*
17	class _PageSetupDialog : public wxPageSetupDialog	18	class _PageSetupDialog : public wxPageSetupDialog
18	{	19	{
19	public:	20	public:
Lines 21-34 Link Here
21	: wxPageSetupDialog(parent, data) {}	22	: wxPageSetupDialog(parent, data) {}
22		23
23	DECLARE_OBJECTDELETED(_PageSetupDialog)	24	DECLARE_OBJECTDELETED(_PageSetupDialog)
24	};	25	};*/
25		26
26	//-----------------------------------------------------------------------------	27	//-----------------------------------------------------------------------------
27		28
28	extern "C" WXEXPORT	29	extern "C" WXEXPORT
29	wxPageSetupDialog* wxPageSetupDialog_ctor(wxWindow* parent, wxPageSetupData* data)	30	wxPageSetupDialog* wxPageSetupDialog_ctor(wxWindow* parent, wxPageSetupData* data)
30	{	31	{
31	return new _PageSetupDialog(parent, data);	32	return new wxPageSetupDialog(parent, data);
32	}	33	}
33		34
34	//-----------------------------------------------------------------------------	35	//-----------------------------------------------------------------------------
Lines 42-60 Link Here
42	//-----------------------------------------------------------------------------	43	//-----------------------------------------------------------------------------
43	// wxPrintDialog	44	// wxPrintDialog
44		45
45	class _PrintDialog : public wxPrintDialog	46	/*class _PrintDialog : public wxPrintDialog
46	{	47	{
47	public:	48	public:
48	_PrintDialog(wxWindow* parent, wxPrintDialogData* data)	49	_PrintDialog(wxWindow* parent, wxPrintDialogData* data)
49	: wxPrintDialog(parent, data) {}	50	: wxPrintDialog(parent, data) {}
50		51
51	DECLARE_OBJECTDELETED(_PrintDialog)	52	DECLARE_OBJECTDELETED(_PrintDialog)
52	};	53	};*/
53		54
54	extern "C" WXEXPORT	55	extern "C" WXEXPORT
55	wxPrintDialog* wxPrintDialog_ctor(wxWindow* parent, wxPrintDialogData* data)	56	wxPrintDialog* wxPrintDialog_ctor(wxWindow* parent, wxPrintDialogData* data)
56	{	57	{
57	return new _PrintDialog(parent, data);	58	return new wxPrintDialog(parent, data);
58	}	59	}
59		60
60	//-----------------------------------------------------------------------------	61	//-----------------------------------------------------------------------------

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx.NET/BitmapButton.cs (-4 / +4 lines)
7	// (C) 2003 Robert Roebling	7	// (C) 2003 Robert Roebling
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: BitmapButton.cs,v 1.14 2004/11/26 21:39:51 olkalex Exp $	10	// $Id: BitmapButton.cs,v 1.15 2005/04/21 16:57:18 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	using System;	13	using System;
Lines 45-51 Link Here
45		45
46	[DllImport("wx-c")] static extern void wxBitmapButton_OnSetBitmap(IntPtr self);	46	[DllImport("wx-c")] static extern void wxBitmapButton_OnSetBitmap(IntPtr self);
47		47
48	[DllImport("wx-c")] static extern void wxBitmapButton_ApplyParentThemeBackground(IntPtr self, IntPtr colour);	48	//[DllImport("wx-c")] static extern void wxBitmapButton_ApplyParentThemeBackground(IntPtr self, IntPtr colour);
49		49
50	//---------------------------------------------------------------------	50	//---------------------------------------------------------------------
51		51
Lines 192-200 Link Here
192		192
193	//---------------------------------------------------------------------	193	//---------------------------------------------------------------------
194		194
195	public virtual void ApplyParentThemeBackground(Colour bg)	195	/*public virtual void ApplyParentThemeBackground(Colour bg)
196	{	196	{
197	wxBitmapButton_ApplyParentThemeBackground(wxObject, Object.SafePtr(bg));	197	wxBitmapButton_ApplyParentThemeBackground(wxObject, Object.SafePtr(bg));
198	}	198	}*/
199	}	199	}
200	}	200	}

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx.NET/Document.cs (-3 / +3 lines)
7	// (C) 2003 Bryan Bulten	7	// (C) 2003 Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: Document.cs,v 1.5 2004/11/24 20:47:43 olkalex Exp $	10	// $Id: Document.cs,v 1.6 2005/04/21 16:57:18 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	#if NOT_READY_YET	13	#if NOT_READY_YET
Lines 33-40 Link Here
33	[DllImport("wx-c")] static extern bool wxDocument_Save(IntPtr self);	33	[DllImport("wx-c")] static extern bool wxDocument_Save(IntPtr self);
34	[DllImport("wx-c")] static extern bool wxDocument_SaveAs(IntPtr self);	34	[DllImport("wx-c")] static extern bool wxDocument_SaveAs(IntPtr self);
35	[DllImport("wx-c")] static extern bool wxDocument_Revert(IntPtr self);	35	[DllImport("wx-c")] static extern bool wxDocument_Revert(IntPtr self);
36	[DllImport("wx-c")] static extern IntPtr wxDocument_SaveObject(IntPtr self, IntPtr stream);	36	//[DllImport("wx-c")] static extern IntPtr wxDocument_SaveObject(IntPtr self, IntPtr stream);
37	[DllImport("wx-c")] static extern IntPtr wxDocument_LoadObject(IntPtr self, IntPtr stream);	37	//[DllImport("wx-c")] static extern IntPtr wxDocument_LoadObject(IntPtr self, IntPtr stream);
38	[DllImport("wx-c")] static extern IntPtr wxDocument_GetCommandProcessor(IntPtr self);	38	[DllImport("wx-c")] static extern IntPtr wxDocument_GetCommandProcessor(IntPtr self);
39	[DllImport("wx-c")] static extern void wxDocument_SetCommandProcessor(IntPtr self, IntPtr proc);	39	[DllImport("wx-c")] static extern void wxDocument_SetCommandProcessor(IntPtr self, IntPtr proc);
40	[DllImport("wx-c")] static extern bool wxDocument_DeleteContents(IntPtr self);	40	[DllImport("wx-c")] static extern bool wxDocument_DeleteContents(IntPtr self);

Lines 7-13 Link Here

(-)wx.NET-0.6.1.old/Src/wx.NET/HTML.cs (-4 / +4 lines)
7	// (C) 2003 Bryan Bulten	7	// (C) 2003 Bryan Bulten
8	// Licensed under the wxWidgets license, see LICENSE.txt for details.	8	// Licensed under the wxWidgets license, see LICENSE.txt for details.
9	//	9	//
10	// $Id: HTML.cs,v 1.18 2004/11/26 21:39:52 olkalex Exp $	10	// $Id: HTML.cs,v 1.19 2005/04/21 16:57:18 olkalex Exp $
11	//-----------------------------------------------------------------------------	11	//-----------------------------------------------------------------------------
12		12
13	using System;	13	using System;
Lines 1979-1985 Link Here
1979	[DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PreviewText(IntPtr self, string htmltext, string basepath);	1979	[DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PreviewText(IntPtr self, string htmltext, string basepath);
1980	[DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PrintFile(IntPtr self, string htmlfile);	1980	[DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PrintFile(IntPtr self, string htmlfile);
1981	[DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PrintText(IntPtr self, string htmltext, string basepath);	1981	[DllImport("wx-c")] static extern bool wxHtmlEasyPrinting_PrintText(IntPtr self, string htmltext, string basepath);
1982	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PrinterSetup(IntPtr self);	1982	//[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PrinterSetup(IntPtr self);
1983	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PageSetup(IntPtr self);	1983	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_PageSetup(IntPtr self);
1984	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_SetHeader(IntPtr self, string header, int pg);	1984	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_SetHeader(IntPtr self, string header, int pg);
1985	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_SetFooter(IntPtr self, string footer, int pg);	1985	[DllImport("wx-c")] static extern void wxHtmlEasyPrinting_SetFooter(IntPtr self, string footer, int pg);
Lines 2042-2051 Link Here
2042		2042
2043	//-----------------------------------------------------------------------------	2043	//-----------------------------------------------------------------------------
2044		2044
2045	public void PrinterSetup()	2045	/*public void PrinterSetup()
2046	{	2046	{
2047	wxHtmlEasyPrinting_PrinterSetup(wxObject);	2047	wxHtmlEasyPrinting_PrinterSetup(wxObject);
2048	}	2048	}*/
2049		2049
2050	//-----------------------------------------------------------------------------	2050	//-----------------------------------------------------------------------------
2051		2051