Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

use wxString instead of dstr

  • Loading branch information...
commit 44b338b75429c052cd97706abffc38c2801840f0 1 parent a85ed6c
@afb afb authored
Showing with 931 additions and 866 deletions.
  1. +4 −4 wx/App.d
  2. +2 −2 wx/ArrayString.d
  3. +3 −3 wx/BitmapButton.d
  4. +4 −4 wx/Choice.d
  5. +4 −4 wx/ChoiceDialog.d
  6. +2 −2 wx/ClientData.d
  7. +6 −6 wx/ComboBox.d
  8. +2 −2 wx/CommandEvent.d
  9. +10 −10 wx/Config.d
  10. +2 −2 wx/Control.d
  11. +2 −2 wx/DataFormat.d
  12. +2 −2 wx/DataObject.d
  13. +2 −2 wx/Dialog.d
  14. +4 −4 wx/DirDialog.d
  15. +2 −2 wx/Display.d
  16. +3 −3 wx/Document.d
  17. +22 −22 wx/FileDialog.d
  18. +8 −8 wx/FindReplaceDialog.d
  19. +12 −12 wx/Font.d
  20. +15 −15 wx/FontMisc.d
  21. +2 −2 wx/GdiCommon.d
  22. +48 −48 wx/Grid.d
  23. +38 −38 wx/HTML.d
  24. +4 −4 wx/HelpEvent.d
  25. +2 −2 wx/HtmlListBox.d
  26. +10 −10 wx/Image.d
  27. +4 −4 wx/ListBox.d
  28. +8 −8 wx/ListCtrl.d
  29. +2 −2 wx/Listbook.d
  30. +20 −20 wx/Locale.d
  31. +6 −6 wx/Menu.d
  32. +6 −6 wx/MenuBar.d
  33. +10 −10 wx/MenuItem.d
  34. +2 −2 wx/Notebook.d
  35. +12 −12 wx/PrintData.d
  36. +2 −2 wx/Printer.d
  37. +6 −6 wx/RadioBox.d
  38. +2 −2 wx/StatusBar.d
  39. +14 −14 wx/StyledTextCtrl.d
  40. +6 −6 wx/TextCtrl.d
  41. +6 −6 wx/TextDialog.d
  42. +10 −10 wx/ToolBar.d
  43. +2 −2 wx/ToolTip.d
  44. +4 −4 wx/TreeCtrl.d
  45. +2 −2 wx/UpdateUIEvent.d
  46. +4 −4 wx/Utils.d
  47. +7 −7 wx/Window.d
  48. +2 −2 wx/aui/DockArt.d
  49. +5 −5 wx/common.d
  50. +9 −9 wx/wxDateTime.d
  51. +6 −6 wx/wxObject.d
  52. +2 −5 wx/wxPlatform.d
  53. +45 −9 wx/wxString.d
  54. +2 −2 wx/wxVersion.d
  55. +4 −4 wxc/app.cpp
  56. +2 −2 wxc/bitmapbutton.cpp
  57. +4 −4 wxc/choice.cpp
  58. +4 −4 wxc/choicedialog.cpp
  59. +2 −2 wxc/clientdata.cpp
  60. +6 −6 wxc/combobox.cpp
  61. +2 −2 wxc/commandevent.cpp
  62. +16 −77 wxc/common.h
  63. +10 −10 wxc/config.cpp
  64. +2 −2 wxc/control.cpp
  65. +2 −2 wxc/dataformat.cpp
  66. +2 −2 wxc/dataobject.cpp
  67. +2 −2 wxc/dialog.cpp
  68. +6 −6 wxc/dirdialog.cpp
  69. +2 −2 wxc/display.cpp
  70. +6 −6 wxc/document.cpp
  71. +18 −18 wxc/filedialog.cpp
  72. +8 −8 wxc/findreplacedialog.cpp
  73. +12 −12 wxc/font.cpp
  74. +12 −12 wxc/fontmisc.cpp
  75. +2 −2 wxc/gdicmn.cpp
  76. +8 −8 wxc/global.cpp
  77. +45 −45 wxc/grid.cpp
  78. +4 −4 wxc/helpevent.cpp
  79. +41 −42 wxc/html.cpp
  80. +2 −2 wxc/htmllbox.cpp
  81. +10 −10 wxc/image.cpp
  82. +2 −2 wxc/listbook.cpp
  83. +4 −4 wxc/listbox.cpp
  84. +8 −8 wxc/listctrl.cpp
  85. +20 −20 wxc/locale.cpp
  86. +2 −2 wxc/log.cpp
  87. +6 −6 wxc/menu.cpp
  88. +6 −6 wxc/menubar.cpp
  89. +10 −10 wxc/menuitem.cpp
  90. +2 −2 wxc/notebook.cpp
  91. +4 −4 wxc/object.cpp
  92. +16 −16 wxc/printdata.cpp
  93. +2 −2 wxc/printer.cpp
  94. +6 −6 wxc/radiobox.cpp
  95. +5 −2 wxc/splitterwindow.cpp
  96. +2 −2 wxc/statusbar.cpp
  97. +14 −14 wxc/styledtextctrl.cpp
  98. +2 −2 wxc/tabctrl.cpp
  99. +8 −8 wxc/textctrl.cpp
  100. +6 −6 wxc/textdialog.cpp
  101. +10 −10 wxc/toolbar.cpp
  102. +2 −2 wxc/tooltip.cpp
  103. +4 −4 wxc/treectrl.cpp
  104. +2 −2 wxc/updateuievent.cpp
  105. +15 −12 wxc/window.cpp
  106. +14 −14 wxc/wxaui.cpp
  107. +2 −2 wxc/wxplatform.cpp
  108. +98 −9 wxc/wxstring.cpp
  109. +2 −3 wxc/wxversion.cpp
  110. +2 −2 wxc/xmlresource.cpp
View
8 wx/App.d
@@ -45,10 +45,10 @@ private import std.utf;
static extern (C) void wxApp_Run(int argc, char** argv);
static extern (C) void wxApp_SetVendorName(IntPtr self, string name);
- static extern (C) string wxApp_GetVendorName(IntPtr self);
+ static extern (C) IntPtr wxApp_GetVendorName(IntPtr self);
static extern (C) void wxApp_SetAppName(IntPtr self, string name);
- static extern (C) string wxApp_GetAppName(IntPtr self);
+ static extern (C) IntPtr wxApp_GetAppName(IntPtr self);
static extern (C) void wxApp_SetTopWindow(IntPtr self, IntPtr window);
static extern (C) IntPtr wxApp_GetTopWindow(IntPtr self);
@@ -171,8 +171,8 @@ private import std.utf;
//---------------------------------------------------------------------
- public string VendorName() { return wxApp_GetVendorName(wxobj).dup; }
- public string AppName() { return wxApp_GetAppName(wxobj).dup; }
+ public string VendorName() { return cast(string) new wxString(wxApp_GetVendorName(wxobj), true); }
+ public string AppName() { return cast(string) new wxString(wxApp_GetAppName(wxobj), true); }
//---------------------------------------------------------------------
View
4 wx/ArrayString.d
@@ -7,7 +7,7 @@ public import wx.common;
static extern (C) void wxArrayString_dtor(IntPtr self);
static extern (C) void wxArrayString_RegisterDisposable(IntPtr self, Virtual_Dispose onDispose);
static extern (C) void wxArrayString_Add(IntPtr self, string toadd);
- static extern (C) string wxArrayString_Item(IntPtr self, int num);
+ static extern (C) IntPtr wxArrayString_Item(IntPtr self, int num);
static extern (C) int wxArrayString_GetCount(IntPtr self);
//! \endcond
@@ -46,7 +46,7 @@ public import wx.common;
public string Item(int num)
{
- return wxArrayString_Item(wxobj, num).dup;
+ return cast(string) new wxString(wxArrayString_Item(wxobj, num), true);
}
public void Add(string toadd)
View
6 wx/BitmapButton.d
@@ -31,7 +31,7 @@ public import wx.Control;
static extern (C) void wxBitmapButton_SetDefault(IntPtr self);
static extern (C) void wxBitmapButton_SetLabel(IntPtr self, string label);
- static extern (C) string wxBitmapButton_GetLabel(IntPtr self);
+ static extern (C) IntPtr wxBitmapButton_GetLabel(IntPtr self);
static extern (C) bool wxBitmapButton_Enable(IntPtr self, bool enable);
@@ -132,7 +132,7 @@ public import wx.Control;
//---------------------------------------------------------------------
- public string StringLabel() { return wxBitmapButton_GetLabel(wxobj).dup; }
+ public string StringLabel() { return cast(string) new wxString(wxBitmapButton_GetLabel(wxobj), true); }
public void StringLabel(string value) { wxBitmapButton_SetLabel(wxobj, value); }
public void SetLabel(string label)
@@ -142,7 +142,7 @@ public import wx.Control;
public string GetLabel()
{
- return wxBitmapButton_GetLabel(wxobj).dup;
+ return cast(string) new wxString(wxBitmapButton_GetLabel(wxobj), true);
}
//---------------------------------------------------------------------
View
8 wx/Choice.d
@@ -27,14 +27,14 @@ public import wx.ArrayString;
static extern (C) void wxChoice_SetSelection(IntPtr self, int n);
static extern (C) bool wxChoice_SetStringSelection(IntPtr self, string s);
- static extern (C) string wxChoice_GetStringSelection(IntPtr self);
+ static extern (C) IntPtr wxChoice_GetStringSelection(IntPtr self);
static extern (C) void wxChoice_SetColumns(IntPtr self, int n);
static extern (C) int wxChoice_GetColumns(IntPtr self);
static extern (C) void wxChoice_Command(IntPtr self, IntPtr evt);
static extern (C) int wxChoice_GetCount(IntPtr self);
- static extern (C) string wxChoice_GetString(IntPtr self, int n);
+ static extern (C) IntPtr wxChoice_GetString(IntPtr self, int n);
static extern (C) int wxChoice_GetSelection(IntPtr self);
static extern (C) IntPtr wxChoice_GetClientData(IntPtr self, int n);
@@ -195,7 +195,7 @@ public import wx.ArrayString;
//---------------------------------------------------------------------
- public string StringSelection() { return wxChoice_GetStringSelection(wxobj).dup; }
+ public string StringSelection() { return cast(string) new wxString(wxChoice_GetStringSelection(wxobj), true); }
public void StringSelection(string value) { wxChoice_SetStringSelection(wxobj, value); }
//---------------------------------------------------------------------
@@ -218,7 +218,7 @@ public import wx.ArrayString;
public string GetString(int n)
{
- return wxChoice_GetString(wxobj, n).dup;
+ return cast(string) new wxString(wxChoice_GetString(wxobj, n), true);
}
//---------------------------------------------------------------------
View
8 wx/ChoiceDialog.d
@@ -23,7 +23,7 @@ public import wx.ArrayInt;
static extern (C) IntPtr wxSingleChoiceDialog_ctor(IntPtr parent, string message, string caption, int n, string* choices, IntPtr clientData, uint style, inout Point pos);
static extern (C) void wxSingleChoiceDialog_SetSelection(IntPtr self, int sel);
static extern (C) int wxSingleChoiceDialog_GetSelection(IntPtr self);
- static extern (C) string wxSingleChoiceDialog_GetStringSelection(IntPtr self);
+ static extern (C) IntPtr wxSingleChoiceDialog_GetStringSelection(IntPtr self);
static extern (C) IntPtr wxSingleChoiceDialog_GetSelectionClientData(IntPtr self);
//! \endcond
@@ -65,7 +65,7 @@ public import wx.ArrayInt;
public string StringSelection()
{
- return wxSingleChoiceDialog_GetStringSelection(wxobj).dup;
+ return cast(string) new wxString(wxSingleChoiceDialog_GetStringSelection(wxobj), true);
}
//-----------------------------------------------------------------------------
@@ -114,7 +114,7 @@ public import wx.ArrayInt;
//-----------------------------------------------------------------------------
//! \cond EXTERN
- static extern (C) string wxGetSingleChoice_func(string message, string caption, int n, string* choices, IntPtr parent, int x, int y, bool centre, int width, int height);
+ static extern (C) IntPtr wxGetSingleChoice_func(string message, string caption, int n, string* choices, IntPtr parent, int x, int y, bool centre, int width, int height);
static extern (C) int wxGetSingleChoiceIndex_func(string message, string caption, int n, string* choices, IntPtr parent, int x, int y, bool centre, int width, int height);
static extern (C) void* wxGetSingleChoiceData_func(string message, string caption, int n, string* choices, void **client_data, IntPtr parent, int x, int y, bool centre, int width, int height);
static extern (C) uint wxGetMultipleChoices_func(IntPtr selections,string message, string caption, int n, string* choices, IntPtr parent, int x, int y, bool centre, int width, int height);
@@ -122,7 +122,7 @@ public import wx.ArrayInt;
public string GetSingleChoice(string message, string caption, string[] choices, Window parent = null, int x = -1, int y= -1, bool centre = true, int width = SingleChoiceDialog.wxCHOICE_WIDTH, int height = SingleChoiceDialog.wxCHOICE_HEIGHT)
{
- return wxGetSingleChoice_func(message, caption, choices.length, choices.ptr, wxObject.SafePtr(parent), x, y, centre, width, height).dup;
+ return cast(string) new wxString(wxGetSingleChoice_func(message, caption, choices.length, choices.ptr, wxObject.SafePtr(parent), x, y, centre, width, height), true);
}
public int GetSingleChoiceIndex(string message, string caption, string[] choices, Window parent = null, int x = -1, int y= -1, bool centre = true, int width = SingleChoiceDialog.wxCHOICE_WIDTH, int height = SingleChoiceDialog.wxCHOICE_HEIGHT)
View
4 wx/ClientData.d
@@ -57,7 +57,7 @@ public import wx.common;
static extern (C) IntPtr wxStringClientData_ctor(string data);
static extern (C) void wxStringClientData_dtor(IntPtr self);
static extern (C) void wxStringClientData_SetData(IntPtr self, string data);
- static extern (C) string wxStringClientData_GetData(IntPtr self);
+ static extern (C) IntPtr wxStringClientData_GetData(IntPtr self);
//! \endcond
//---------------------------------------------------------------------
@@ -87,7 +87,7 @@ public import wx.common;
override protected void dtor() { wxStringClientData_dtor(wxobj); }
//---------------------------------------------------------------------
- public string Data() { return wxStringClientData_GetData(wxobj).dup; }
+ public string Data() { return cast(string) new wxString(wxStringClientData_GetData(wxobj), true); }
public void Data(string value) { wxStringClientData_SetData(wxobj, value); }
}
View
12 wx/ComboBox.d
@@ -33,13 +33,13 @@ public import wx.ClientData;
static extern (C) int wxComboBox_GetCount(IntPtr self);
static extern (C) int wxComboBox_GetSelection(IntPtr self);
- static extern (C) string wxComboBox_GetString(IntPtr self, int n);
+ static extern (C) IntPtr wxComboBox_GetString(IntPtr self, int n);
//static extern (C) void wxComboBox_SetString(IntPtr self, int n, string text);
- static extern (C) string wxComboBox_GetValue(IntPtr self);
+ static extern (C) IntPtr wxComboBox_GetValue(IntPtr self);
static extern (C) void wxComboBox_SetValue(IntPtr self, string text);
- static extern (C) string wxComboBox_GetStringSelection(IntPtr self);
+ static extern (C) IntPtr wxComboBox_GetStringSelection(IntPtr self);
static extern (C) void wxComboBox_SetStringSelection(IntPtr self, string value);
static extern (C) IntPtr wxComboBox_GetClientData(IntPtr self, int n);
@@ -125,7 +125,7 @@ public import wx.ClientData;
//---------------------------------------------------------------------
- public string StringSelection() { return wxComboBox_GetStringSelection(wxobj).dup; }
+ public string StringSelection() { return cast(string) new wxString(wxComboBox_GetStringSelection(wxobj), true); }
public void StringSelection(string value) { wxComboBox_SetStringSelection(wxobj, value); }
//---------------------------------------------------------------------
@@ -136,7 +136,7 @@ public import wx.ClientData;
public string GetString(int n)
{
- return wxComboBox_GetString(wxobj, n).dup;
+ return cast(string) new wxString(wxComboBox_GetString(wxobj, n), true);
}
//---------------------------------------------------------------------
@@ -254,7 +254,7 @@ public import wx.ClientData;
//---------------------------------------------------------------------
- public string Value() { return wxComboBox_GetValue(wxobj).dup; }
+ public string Value() { return cast(string) new wxString(wxComboBox_GetValue(wxobj), true); }
public void Value(string value) { wxComboBox_SetValue(wxobj, value); }
public void Select(int n)
View
4 wx/CommandEvent.d
@@ -22,7 +22,7 @@ public import wx.ClientData;
//! \cond EXTERN
static extern (C) IntPtr wxCommandEvent_ctor(int type,int winid);
static extern (C) int wxCommandEvent_GetSelection(IntPtr self);
- static extern (C) string wxCommandEvent_GetString(IntPtr self);
+ static extern (C) IntPtr wxCommandEvent_GetString(IntPtr self);
static extern (C) void wxCommandEvent_SetString(IntPtr self, string s);
static extern (C) bool wxCommandEvent_IsChecked(IntPtr self);
static extern (C) bool wxCommandEvent_IsSelection(IntPtr self);
@@ -54,7 +54,7 @@ public import wx.ClientData;
//-----------------------------------------------------------------------------
- public string String() { return wxCommandEvent_GetString(wxobj).dup; }
+ public string String() { return cast(string) new wxString(wxCommandEvent_GetString(wxobj), true); }
public void String(string value) { wxCommandEvent_SetString(wxobj, value); }
//-----------------------------------------------------------------------------
View
20 wx/Config.d
@@ -44,7 +44,7 @@ public import wx.wxString;
static extern (C) IntPtr wxConfigBase_Create();
static extern (C) void wxConfigBase_DontCreateOnDemand();
static extern (C) void wxConfigBase_SetPath(IntPtr self, string strPath);
- static extern (C) string wxConfigBase_GetPath(IntPtr self);
+ static extern (C) IntPtr wxConfigBase_GetPath(IntPtr self);
static extern (C) bool wxConfigBase_GetFirstGroup(IntPtr self, IntPtr str, inout int lIndex);
static extern (C) bool wxConfigBase_GetNextGroup(IntPtr self, IntPtr str, inout int lIndex);
static extern (C) bool wxConfigBase_GetFirstEntry(IntPtr self, IntPtr str, inout int lIndex);
@@ -63,7 +63,7 @@ public import wx.wxString;
static extern (C) bool wxConfigBase_ReadDblDef(IntPtr self, string key, inout double val, double defVal);
static extern (C) bool wxConfigBase_ReadBool(IntPtr self, string key, inout bool val);
static extern (C) bool wxConfigBase_ReadBoolDef(IntPtr self, string key, inout bool val, bool defVal);
- static extern (C) string wxConfigBase_ReadStrRet(IntPtr self, string key, string defVal);
+ static extern (C) IntPtr wxConfigBase_ReadStrRet(IntPtr self, string key, string defVal);
static extern (C) int wxConfigBase_ReadIntRet(IntPtr self, string key, int defVal);
static extern (C) bool wxConfigBase_WriteStr(IntPtr self, string key, string val);
static extern (C) bool wxConfigBase_WriteInt(IntPtr self, string key, int val);
@@ -77,12 +77,12 @@ public import wx.wxString;
static extern (C) bool wxConfigBase_DeleteAll(IntPtr self);
static extern (C) bool wxConfigBase_IsExpandingEnvVars(IntPtr self);
static extern (C) void wxConfigBase_SetExpandEnvVars(IntPtr self, bool bDoIt);
- static extern (C) string wxConfigBase_ExpandEnvVars(IntPtr self, string str);
+ static extern (C) IntPtr wxConfigBase_ExpandEnvVars(IntPtr self, string str);
static extern (C) void wxConfigBase_SetRecordDefaults(IntPtr self, bool bDoIt);
static extern (C) bool wxConfigBase_IsRecordingDefaults(IntPtr self);
- static extern (C) string wxConfigBase_GetAppName(IntPtr self);
+ static extern (C) IntPtr wxConfigBase_GetAppName(IntPtr self);
static extern (C) void wxConfigBase_SetAppName(IntPtr self, string appName);
- static extern (C) string wxConfigBase_GetVendorName(IntPtr self);
+ static extern (C) IntPtr wxConfigBase_GetVendorName(IntPtr self);
static extern (C) void wxConfigBase_SetVendorName(IntPtr self, string vendorName);
static extern (C) void wxConfigBase_SetStyle(IntPtr self, int style);
static extern (C) int wxConfigBase_GetStyle(IntPtr self);
@@ -130,7 +130,7 @@ public import wx.wxString;
//---------------------------------------------------------------------
public void Path(string value) { wxConfigBase_SetPath(wxobj, value); }
- public string Path() { return wxConfigBase_GetPath(wxobj).dup; }
+ public string Path() { return cast(string) new wxString(wxConfigBase_GetPath(wxobj), true); }
//---------------------------------------------------------------------
@@ -365,7 +365,7 @@ public import wx.wxString;
/+
public string Read(string key, string defVal)
{
- return wxConfigBase_ReadStrRet(wxobj, key, defVal).dup;
+ return cast(string) new wxString(wxConfigBase_ReadStrRet(wxobj, key, defVal), true);
}
+/
public int Read(string key, int defVal)
@@ -497,7 +497,7 @@ public import wx.wxString;
/*public string ExpandEnvVars(string str)
{
- return new wxString(wxConfigBase_ExpandEnvVars(wxobj, str));
+ return cast(string) new wxString(wxConfigBase_ExpandEnvVars(wxobj, str));
}*/
//---------------------------------------------------------------------
@@ -507,12 +507,12 @@ public import wx.wxString;
//---------------------------------------------------------------------
- public string AppName() { return wxConfigBase_GetAppName(wxobj).dup; }
+ public string AppName() { return cast(string) new wxString(wxConfigBase_GetAppName(wxobj), true); }
public void AppName(string value) { wxConfigBase_SetAppName(wxobj, value); }
//---------------------------------------------------------------------
- public string VendorName() { return wxConfigBase_GetVendorName(wxobj).dup; }
+ public string VendorName() { return cast(string) new wxString(wxConfigBase_GetVendorName(wxobj), true); }
public void VendorName(string value) { wxConfigBase_SetVendorName(wxobj, value); }
//---------------------------------------------------------------------
View
4 wx/Control.d
@@ -19,7 +19,7 @@ public import wx.Window;
//! \cond EXTERN
static extern (C) void wxControl_Command(IntPtr self, IntPtr evt);
- static extern (C) string wxControl_GetLabel(IntPtr self);
+ static extern (C) IntPtr wxControl_GetLabel(IntPtr self);
static extern (C) void wxControl_SetLabel(IntPtr self, string label);
static extern (C) int wxControl_GetAlignment(IntPtr self);
@@ -51,7 +51,7 @@ public import wx.Window;
//---------------------------------------------------------------------
- public string Label() { return wxControl_GetLabel(wxobj).dup; }
+ public string Label() { return cast(string) new wxString(wxControl_GetLabel(wxobj), true); }
public void Label(string value) { wxControl_SetLabel(wxobj, value); }
//---------------------------------------------------------------------
View
4 wx/DataFormat.d
@@ -44,7 +44,7 @@ public import wx.common;
static extern (C) IntPtr wxDataFormat_ctorByType(int type);
static extern (C) IntPtr wxDataFormat_ctorById(string id);
- static extern (C) string wxDataFormat_GetId(IntPtr self);
+ static extern (C) IntPtr wxDataFormat_GetId(IntPtr self);
static extern (C) void wxDataFormat_SetId(IntPtr self, string id);
static extern (C) int wxDataFormat_GetType(IntPtr self);
@@ -82,7 +82,7 @@ public import wx.common;
//-----------------------------------------------------------------------------
- public string Id() { return wxDataFormat_GetId(wxobj); }
+ public string Id() { return cast(string) new wxString(wxDataFormat_GetId(wxobj), true); }
public void Id(string value) { wxDataFormat_SetId(wxobj, value); }
//-----------------------------------------------------------------------------
View
4 wx/DataObject.d
@@ -83,7 +83,7 @@ public import wx.ArrayString;
static extern (C) void wxTextDataObject_dtor(IntPtr self);
static extern (C) void wxTextDataObject_RegisterDisposable(IntPtr self, Virtual_Dispose onDispose);
static extern (C) int wxTextDataObject_GetTextLength(IntPtr self);
- static extern (C) string wxTextDataObject_GetText(IntPtr self);
+ static extern (C) IntPtr wxTextDataObject_GetText(IntPtr self);
static extern (C) void wxTextDataObject_SetText(IntPtr self, string text);
//! \endcond
@@ -122,7 +122,7 @@ public import wx.ArrayString;
//---------------------------------------------------------------------
- public string Text() { return wxTextDataObject_GetText(wxobj).dup; }
+ public string Text() { return cast(string) new wxString(wxTextDataObject_GetText(wxobj), true); }
public void Text(string value) { wxTextDataObject_SetText(wxobj, value); }
}
View
4 wx/Dialog.d
@@ -24,7 +24,7 @@ public import wx.Window;
static extern (C) void wxDialog_SetReturnCode(IntPtr self, int returnCode);
static extern (C) int wxDialog_GetReturnCode(IntPtr self);
- static extern (C) string wxDialog_GetTitle(IntPtr self);
+ static extern (C) IntPtr wxDialog_GetTitle(IntPtr self);
static extern (C) void wxDialog_SetTitle(IntPtr self, string title);
static extern (C) bool wxDialog_Create(IntPtr self, IntPtr parent, int id, string title, inout Point pos, inout Size size, uint style, string name);
@@ -119,7 +119,7 @@ public import wx.Window;
//---------------------------------------------------------------------
- public override string Title() { return wxDialog_GetTitle(wxobj).dup; }
+ public override string Title() { return cast(string) new wxString(wxDialog_GetTitle(wxobj), true); }
public override void Title(string value) { wxDialog_SetTitle(wxobj, value); }
//---------------------------------------------------------------------
View
8 wx/DirDialog.d
@@ -21,13 +21,13 @@ public import wx.Dialog;
static extern (C) IntPtr wxDirDialog_ctor(IntPtr parent, string message, string defaultPath, uint style, inout Point pos, inout Size size, string name);
static extern (C) void wxDirDialog_SetPath(IntPtr self, string path);
- static extern (C) string wxDirDialog_GetPath(IntPtr self);
+ static extern (C) IntPtr wxDirDialog_GetPath(IntPtr self);
static extern (C) int wxDirDialog_GetStyle(IntPtr self);
static extern (C) void wxDirDialog_SetStyle(IntPtr self, int style);
static extern (C) void wxDirDialog_SetMessage(IntPtr self, string message);
- static extern (C) string wxDirDialog_GetMessage(IntPtr self);
+ static extern (C) IntPtr wxDirDialog_GetMessage(IntPtr self);
static extern (C) int wxDirDialog_ShowModal(IntPtr self);
//! \endcond
@@ -52,12 +52,12 @@ public import wx.Dialog;
//-----------------------------------------------------------------------------
public void Path(string value) { wxDirDialog_SetPath(wxobj, value); }
- public string Path() { return wxDirDialog_GetPath(wxobj).dup; }
+ public string Path() { return cast(string) new wxString(wxDirDialog_GetPath(wxobj), true); }
//-----------------------------------------------------------------------------
public void Message(string value) { wxDirDialog_SetMessage(wxobj, value); }
- public string Message() { return wxDirDialog_GetMessage(wxobj).dup; }
+ public string Message() { return cast(string) new wxString(wxDirDialog_GetMessage(wxobj), true); }
//-----------------------------------------------------------------------------
View
4 wx/Display.d
@@ -39,7 +39,7 @@ public import wx.Window;
static extern (C) int wxDisplay_GetFromPoint(inout Point pt);
static extern (C) int wxDisplay_GetFromWindow(IntPtr window);
static extern (C) void wxDisplay_GetGeometry(IntPtr self, out Rectangle rect);
- static extern (C) string wxDisplay_GetName(IntPtr self);
+ static extern (C) IntPtr wxDisplay_GetName(IntPtr self);
static extern (C) bool wxDisplay_IsPrimary(IntPtr self);
static extern (C) void wxDisplay_GetCurrentMode(IntPtr self, out VideoMode mode);
static extern (C) bool wxDisplay_ChangeMode(IntPtr self, VideoMode mode);
@@ -156,7 +156,7 @@ public import wx.Window;
/+virtual+/ public string Name()
{
- return wxDisplay_GetName(wxobj).dup;
+ return cast(string) new wxString(wxDisplay_GetName(wxobj), true);
}
//------------------------------------------------------------------------
View
6 wx/Document.d
@@ -72,15 +72,15 @@ version(NOT_READY_YET){
}
public void Filename(string value) { SetFilename(value, true); }
- public string Filename() { return wxDocument_GetFilename(wxobj).dup; }
+ public string Filename() { return cast(string) new wxString(wxDocument_GetFilename(wxobj), true); }
//-----------------------------------------------------------------------------
public void Title(string value) { wxDocument_SetTitle(wxobj, value); }
- public string Title() { return wxDocument_GetTitle(wxobj).dup; }
+ public string Title() { return cast(string) new wxString(wxDocument_GetTitle(wxobj), true); }
public void DocumentName(string value) { wxDocument_SetDocumentName(wxobj, value); }
- public string DocumentName() { return wxDocument_GetDocumentName(wxobj).dup; }
+ public string DocumentName() { return cast(string) new wxString(wxDocument_GetDocumentName(wxobj), true); }
//-----------------------------------------------------------------------------
View
44 wx/FileDialog.d
@@ -27,23 +27,23 @@ private import std.string;
static extern (C) IntPtr wxFileDialog_ctor(IntPtr parent, string message, string defaultDir, string defaultFile, string wildcard, uint style, inout Point pos);
static extern (C) void wxFileDialog_dtor(IntPtr self);
- static extern (C) string wxFileDialog_GetDirectory(IntPtr self);
+ static extern (C) IntPtr wxFileDialog_GetDirectory(IntPtr self);
static extern (C) void wxFileDialog_SetDirectory(IntPtr self, string dir);
- static extern (C) string wxFileDialog_GetFilename(IntPtr self);
+ static extern (C) IntPtr wxFileDialog_GetFilename(IntPtr self);
static extern (C) void wxFileDialog_SetFilename(IntPtr self, string filename);
- static extern (C) string wxFileDialog_GetPath(IntPtr self);
+ static extern (C) IntPtr wxFileDialog_GetPath(IntPtr self);
static extern (C) void wxFileDialog_SetPath(IntPtr self, string path);
static extern (C) void wxFileDialog_SetFilterIndex(IntPtr self, int filterIndex);
static extern (C) int wxFileDialog_GetFilterIndex(IntPtr self);
- static extern (C) string wxFileDialog_GetWildcard(IntPtr self);
+ static extern (C) IntPtr wxFileDialog_GetWildcard(IntPtr self);
static extern (C) void wxFileDialog_SetWildcard(IntPtr self, string wildcard);
static extern (C) void wxFileDialog_SetMessage(IntPtr self, string message);
- static extern (C) string wxFileDialog_GetMessage(IntPtr self);
+ static extern (C) IntPtr wxFileDialog_GetMessage(IntPtr self);
static extern (C) int wxFileDialog_ShowModal(IntPtr self);
@@ -82,20 +82,20 @@ private import std.string;
//---------------------------------------------------------------------
- public string Directory() { return wxFileDialog_GetDirectory(wxobj).dup; }
+ public string Directory() { return cast(string) new wxString(wxFileDialog_GetDirectory(wxobj), true); }
public void Directory(string value) { wxFileDialog_SetDirectory(wxobj, value); }
- public string Filename() { return wxFileDialog_GetFilename(wxobj).dup; }
+ public string Filename() { return cast(string) new wxString(wxFileDialog_GetFilename(wxobj), true); }
public void Filename(string value) { wxFileDialog_SetFilename(wxobj, value); }
- public string Path() { return wxFileDialog_GetPath(wxobj).dup; }
+ public string Path() { return cast(string) new wxString(wxFileDialog_GetPath(wxobj), true); }
public void Path(string value) { wxFileDialog_SetPath(wxobj, value); }
public void FilterIndex(int value) { wxFileDialog_SetFilterIndex(wxobj,value); }
public int FilterIndex() { return wxFileDialog_GetFilterIndex(wxobj); }
public void Message(string value) { wxFileDialog_SetMessage(wxobj,value); }
- public string Message() { return wxFileDialog_GetMessage(wxobj).dup; }
+ public string Message() { return cast(string) new wxString(wxFileDialog_GetMessage(wxobj), true); }
//---------------------------------------------------------------------
@@ -106,7 +106,7 @@ private import std.string;
//---------------------------------------------------------------------
- public string Wildcard() { return wxFileDialog_GetWildcard(wxobj).dup; }
+ public string Wildcard() { return cast(string) new wxString(wxFileDialog_GetWildcard(wxobj), true); }
public void Wildcard(string value) { wxFileDialog_SetWildcard(wxobj, value); }
public int Style() { return cast(int)wxFileDialog_GetStyle(wxobj); }
@@ -120,10 +120,10 @@ private import std.string;
}
//! \cond EXTERN
- static extern (C) string wxFileSelector_func(string message, string default_path, string default_filename, string default_extension, string wildcard, int flags, IntPtr parent, int x, int y);
- static extern (C) string wxFileSelectorEx_func(string message, string default_path, string default_filename,int *indexDefaultExtension, string wildcard, int flags, IntPtr parent, int x, int y);
- static extern (C) string wxLoadFileSelector_func(string what, string extension, string default_name, IntPtr parent);
- static extern (C) string wxSaveFileSelector_func(string what, string extension, string default_name, IntPtr parent);
+ static extern (C) IntPtr wxFileSelector_func(string message, string default_path, string default_filename, string default_extension, string wildcard, int flags, IntPtr parent, int x, int y);
+ static extern (C) IntPtr wxFileSelectorEx_func(string message, string default_path, string default_filename,int *indexDefaultExtension, string wildcard, int flags, IntPtr parent, int x, int y);
+ static extern (C) IntPtr wxLoadFileSelector_func(string what, string extension, string default_name, IntPtr parent);
+ static extern (C) IntPtr wxSaveFileSelector_func(string what, string extension, string default_name, IntPtr parent);
//! \endcond
string FileSelector(
@@ -135,14 +135,14 @@ string FileSelector(
int flags = 0,
Window parent = null, int x = -1, int y = -1)
{
- return wxFileSelector_func(
+ return cast(string) new wxString(wxFileSelector_func(
message,
default_path,
default_filename,
default_extension,
wildcard,
flags,
- wxObject.SafePtr(parent),x,y);
+ wxObject.SafePtr(parent),x,y), true);
}
string FileSelectorEx(
@@ -154,14 +154,14 @@ string FileSelectorEx(
int flags = 0,
Window parent = null, int x = -1, int y = -1)
{
- return wxFileSelectorEx_func(
+ return cast(string) new wxString(wxFileSelectorEx_func(
message,
default_path,
default_filename,
indexDefaultExtension,
wildcard,
flags,
- wxObject.SafePtr(parent),x,y);
+ wxObject.SafePtr(parent),x,y), true);
}
string LoadFileSelector(
@@ -170,11 +170,11 @@ string LoadFileSelector(
string default_name = null,
Window parent = null)
{
- return wxLoadFileSelector_func(
+ return cast(string) new wxString(wxLoadFileSelector_func(
what,
extension,
default_name,
- wxObject.SafePtr(parent));
+ wxObject.SafePtr(parent)), true);
}
string SaveFileSelector(
@@ -183,10 +183,10 @@ string SaveFileSelector(
string default_name = null,
Window parent = null)
{
- return wxSaveFileSelector_func(
+ return cast(string) new wxString(wxSaveFileSelector_func(
what,
extension,
default_name,
- wxObject.SafePtr(parent));
+ wxObject.SafePtr(parent)), true);
}
View
16 wx/FindReplaceDialog.d
@@ -93,10 +93,10 @@ public import wx.CommandEvent;
static extern (C) int wxFindDialogEvent_GetFlags(IntPtr self);
static extern (C) void wxFindDialogEvent_SetFlags(IntPtr self, int flags);
- static extern (C) string wxFindDialogEvent_GetFindString(IntPtr self);
+ static extern (C) IntPtr wxFindDialogEvent_GetFindString(IntPtr self);
static extern (C) void wxFindDialogEvent_SetFindString(IntPtr self, string str);
- static extern (C) string wxFindDialogEvent_GetReplaceString(IntPtr self);
+ static extern (C) IntPtr wxFindDialogEvent_GetReplaceString(IntPtr self);
static extern (C) void wxFindDialogEvent_SetReplaceString(IntPtr self, string str);
static extern (C) IntPtr wxFindDialogEvent_GetDialog(IntPtr self);
@@ -138,12 +138,12 @@ public import wx.CommandEvent;
//-----------------------------------------------------------------------------
- public string FindString() { return wxFindDialogEvent_GetFindString(wxobj).dup; }
+ public string FindString() { return cast(string) new wxString(wxFindDialogEvent_GetFindString(wxobj), true); }
public void FindString(string value) { wxFindDialogEvent_SetFindString(wxobj, value); }
//-----------------------------------------------------------------------------
- public string ReplaceString() { return wxFindDialogEvent_GetReplaceString(wxobj).dup; }
+ public string ReplaceString() { return cast(string) new wxString(wxFindDialogEvent_GetReplaceString(wxobj), true); }
public void ReplaceString(string value) { wxFindDialogEvent_SetReplaceString(wxobj, value); }
//-----------------------------------------------------------------------------
@@ -156,14 +156,14 @@ public import wx.CommandEvent;
//! \cond EXTERN
static extern (C) IntPtr wxFindReplaceData_ctor(uint flags);
- static extern (C) string wxFindReplaceData_GetFindString(IntPtr self);
+ static extern (C) IntPtr wxFindReplaceData_GetFindString(IntPtr self);
static extern (C) void wxFindReplaceData_SetFindString(IntPtr self, string str);
static extern (C) int wxFindReplaceData_GetFlags(IntPtr self);
static extern (C) void wxFindReplaceData_SetFlags(IntPtr self, int flags);
static extern (C) void wxFindReplaceData_SetReplaceString(IntPtr self, string str);
- static extern (C) string wxFindReplaceData_GetReplaceString(IntPtr self);
+ static extern (C) IntPtr wxFindReplaceData_GetReplaceString(IntPtr self);
//! \endcond
//-----------------------------------------------------------------------------
@@ -182,12 +182,12 @@ public import wx.CommandEvent;
//-----------------------------------------------------------------------------
- public string FindString() { return wxFindReplaceData_GetFindString(wxobj).dup; }
+ public string FindString() { return cast(string) new wxString(wxFindReplaceData_GetFindString(wxobj), true); }
public void FindString(string value) { wxFindReplaceData_SetFindString(wxobj, value); }
//-----------------------------------------------------------------------------
- public string ReplaceString() { return wxFindReplaceData_GetReplaceString(wxobj).dup; }
+ public string ReplaceString() { return cast(string) new wxString(wxFindReplaceData_GetReplaceString(wxobj), true); }
public void ReplaceString(string value) { wxFindReplaceData_SetReplaceString(wxobj, value); }
//-----------------------------------------------------------------------------
View
24 wx/Font.d
@@ -171,12 +171,12 @@ public import wx.GDIObject;
static extern (C) int wxFont_GetStyle(IntPtr self);
static extern (C) int wxFont_GetWeight(IntPtr self);
static extern (C) bool wxFont_GetUnderlined(IntPtr self);
- static extern (C) string wxFont_GetFaceName(IntPtr self);
+ static extern (C) IntPtr wxFont_GetFaceName(IntPtr self);
static extern (C) int wxFont_GetEncoding(IntPtr self);
static extern (C) IntPtr wxFont_GetNativeFontInfo(IntPtr self);
static extern (C) bool wxFont_IsFixedWidth(IntPtr self);
- static extern (C) string wxFont_GetNativeFontInfoDesc(IntPtr self);
- static extern (C) string wxFont_GetNativeFontInfoUserDesc(IntPtr self);
+ static extern (C) IntPtr wxFont_GetNativeFontInfoDesc(IntPtr self);
+ static extern (C) IntPtr wxFont_GetNativeFontInfoUserDesc(IntPtr self);
static extern (C) void wxFont_SetPointSize(IntPtr self, int pointSize);
static extern (C) void wxFont_SetFamily(IntPtr self, int family);
static extern (C) void wxFont_SetStyle(IntPtr self, int style);
@@ -185,9 +185,9 @@ public import wx.GDIObject;
static extern (C) void wxFont_SetUnderlined(IntPtr self, bool underlined);
static extern (C) void wxFont_SetEncoding(IntPtr self, int encoding);
static extern (C) void wxFont_SetNativeFontInfoUserDesc(IntPtr self, IntPtr info);
- static extern (C) string wxFont_GetFamilyString(IntPtr self);
- static extern (C) string wxFont_GetStyleString(IntPtr self);
- static extern (C) string wxFont_GetWeightString(IntPtr self);
+ static extern (C) IntPtr wxFont_GetFamilyString(IntPtr self);
+ static extern (C) IntPtr wxFont_GetStyleString(IntPtr self);
+ static extern (C) IntPtr wxFont_GetWeightString(IntPtr self);
static extern (C) void wxFont_SetNoAntiAliasing(IntPtr self, bool no);
static extern (C) bool wxFont_GetNoAntiAliasing(IntPtr self);
static extern (C) int wxFont_GetDefaultEncoding();
@@ -271,14 +271,14 @@ public import wx.GDIObject;
public bool Underlined() { return wxFont_GetUnderlined(wxobj); }
public void Underlined(bool value) { wxFont_SetUnderlined(wxobj, value); }
- public string FaceName() { return wxFont_GetFaceName(wxobj).dup; }
+ public string FaceName() { return cast(string) new wxString(wxFont_GetFaceName(wxobj), true); }
public void FaceName(string value) { wxFont_SetFaceName(wxobj, value); }
- public string FamilyString() { return wxFont_GetFamilyString(wxobj).dup; }
+ public string FamilyString() { return cast(string) new wxString(wxFont_GetFamilyString(wxobj), true); }
- public string StyleString() { return wxFont_GetStyleString(wxobj).dup; }
+ public string StyleString() { return cast(string) new wxString(wxFont_GetStyleString(wxobj), true); }
- public string WeightString() { return wxFont_GetStyleString(wxobj).dup; }
+ public string WeightString() { return cast(string) new wxString(wxFont_GetStyleString(wxobj), true); }
public bool IsFixedWidth() { return wxFont_IsFixedWidth(wxobj); }
@@ -286,9 +286,9 @@ public import wx.GDIObject;
public IntPtr NativeFontInfo() { return wxFont_GetNativeFontInfo(wxobj); }
- public string NativeFontInfoUserDesc() { return wxFont_GetNativeFontInfoUserDesc(wxobj).dup; }
+ public string NativeFontInfoUserDesc() { return cast(string) new wxString(wxFont_GetNativeFontInfoUserDesc(wxobj), true); }
- public string NativeFontInfoDesc() { return wxFont_GetNativeFontInfoDesc(wxobj).dup; }
+ public string NativeFontInfoDesc() { return cast(string) new wxString(wxFont_GetNativeFontInfoDesc(wxobj), true); }
public static Font New(string strNativeFontDesc)
{
View
30 wx/FontMisc.d
@@ -27,8 +27,8 @@ public import wx.ArrayString;
static extern (C) IntPtr wxFontMapper_Set(IntPtr mapper);
static extern (C) int wxFontMapper_GetSupportedEncodingsCount();
static extern (C) int wxFontMapper_GetEncoding(int n);
- static extern (C) string wxFontMapper_GetEncodingName(int encoding);
- static extern (C) string wxFontMapper_GetEncodingDescription(int encoding);
+ static extern (C) IntPtr wxFontMapper_GetEncodingName(int encoding);
+ static extern (C) IntPtr wxFontMapper_GetEncodingDescription(int encoding);
static extern (C) int wxFontMapper_GetEncodingFromName(string name);
static extern (C) int wxFontMapper_CharsetToEncoding(IntPtr self, string charset, bool interactive);
@@ -98,7 +98,7 @@ public import wx.ArrayString;
public static string GetEncodingName(FontEncoding encoding)
{
- return wxFontMapper_GetEncodingName(cast(int)encoding).dup;
+ return cast(string) new wxString(wxFontMapper_GetEncodingName(cast(int)encoding), true);
}
//---------------------------------------------------------------------
@@ -153,7 +153,7 @@ public import wx.ArrayString;
public static string GetEncodingDescription(FontEncoding encoding)
{
- return wxFontMapper_GetEncodingDescription(cast(int)encoding).dup;
+ return cast(string) new wxString(wxFontMapper_GetEncodingDescription(cast(int)encoding), true);
}
//---------------------------------------------------------------------
@@ -176,7 +176,7 @@ public import wx.ArrayString;
//! \cond EXTERN
static extern (C) IntPtr wxEncodingConverter_ctor();
static extern (C) bool wxEncodingConverter_Init(IntPtr self, int input_enc, int output_enc, int method);
- static extern (C) string wxEncodingConverter_Convert(IntPtr self, string input);
+ static extern (C) IntPtr wxEncodingConverter_Convert(IntPtr self, string input);
//! \endcond
//---------------------------------------------------------------------
@@ -212,7 +212,7 @@ public import wx.ArrayString;
public string Convert(string input)
{
- return wxEncodingConverter_Convert(wxobj, input).dup;
+ return cast(string) new wxString(wxEncodingConverter_Convert(wxobj, input), true);
}
}
@@ -221,9 +221,9 @@ public import wx.ArrayString;
//! \cond EXTERN
extern (C) {
alias bool function(FontEnumerator obj, int encoding, bool fixedWidthOnly) Virtual_EnumerateFacenames;
- alias bool function(FontEnumerator obj, string facename) Virtual_EnumerateEncodings;
- alias bool function(FontEnumerator obj, string facename) Virtual_OnFacename;
- alias bool function(FontEnumerator obj, string facename, string encoding) Virtual_OnFontEncoding;
+ alias bool function(FontEnumerator obj, IntPtr facename) Virtual_EnumerateEncodings;
+ alias bool function(FontEnumerator obj, IntPtr facename) Virtual_OnFacename;
+ alias bool function(FontEnumerator obj, IntPtr facename, IntPtr encoding) Virtual_OnFontEncoding;
}
static extern (C) IntPtr wxFontEnumerator_ctor();
@@ -289,9 +289,9 @@ public import wx.ArrayString;
return wxFontEnumerator_OnFacename(wxobj, facename);
}
- extern(C) private static bool staticDoOnFacename(FontEnumerator obj, string facename)
+ extern(C) private static bool staticDoOnFacename(FontEnumerator obj, IntPtr facename)
{
- return obj.OnFacename(facename);
+ return obj.OnFacename(cast(string) new wxString(facename));
}
//---------------------------------------------------------------------
@@ -301,9 +301,9 @@ public import wx.ArrayString;
return wxFontEnumerator_OnFontEncoding(wxobj, facename, encoding);
}
- extern(C) private static bool staticDoOnFontEncoding(FontEnumerator obj, string facename, string encoding)
+ extern(C) private static bool staticDoOnFontEncoding(FontEnumerator obj, IntPtr facename, IntPtr encoding)
{
- return obj.OnFontEncoding(facename, encoding);
+ return obj.OnFontEncoding(cast(string) new wxString(facename), cast(string) new wxString(encoding));
}
//---------------------------------------------------------------------
@@ -340,8 +340,8 @@ public import wx.ArrayString;
return wxFontEnumerator_EnumerateEncodings(wxobj, facename);
}
- extern(C) private static bool staticDoEnumerateEncodings(FontEnumerator obj, string facename)
+ extern(C) private static bool staticDoEnumerateEncodings(FontEnumerator obj, IntPtr facename)
{
- return obj.EnumerateEncodings(facename);
+ return obj.EnumerateEncodings(cast(string) new wxString(facename));
}
}
View
4 wx/GdiCommon.d
@@ -118,7 +118,7 @@ public import wx.Colour;
static extern (C) IntPtr wxColourDatabase_ctor();
static extern (C) void wxColourDataBase_dtor(IntPtr self);
static extern (C) IntPtr wxColourDatabase_Find(IntPtr self, string name);
- static extern (C) string wxColourDatabase_FindName(IntPtr self, IntPtr colour);
+ static extern (C) IntPtr wxColourDatabase_FindName(IntPtr self, IntPtr colour);
static extern (C) void wxColourDatabase_AddColour(IntPtr self, string name, IntPtr colour);
//! \endcond
@@ -156,7 +156,7 @@ public import wx.Colour;
public string FindName(Colour colour)
{
- return wxColourDatabase_FindName(wxobj, wxObject.SafePtr(colour)).dup;
+ return cast(string) new wxString(wxColourDatabase_FindName(wxobj, wxObject.SafePtr(colour)), true);
}
//-----------------------------------------------------------------------------
View
96 wx/Grid.d
@@ -180,7 +180,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGridCellEditor_StartingClick(IntPtr self);
static extern (C) void wxGridCellEditor_HandleReturn(IntPtr self, IntPtr evt);
static extern (C) void wxGridCellEditor_Destroy(IntPtr self);
- static extern (C) string wxGridCellEditor_GetValue(IntPtr self);
+ static extern (C) IntPtr wxGridCellEditor_GetValue(IntPtr self);
//! \endcond
//-----------------------------------------------------------------------------
@@ -369,7 +369,7 @@ public import wx.ScrolledWindow;
}
public abstract string GetValue();
// {
-// return wxGridCellEditor_GetValue(wxobj).dup;
+// return cast(string) new wxString(wxGridCellEditor_GetValue(wxobj), true);
// }
}
@@ -388,7 +388,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGridCellTextEditor_StartingKey(IntPtr self, IntPtr evt);
static extern (C) void wxGridCellTextEditor_SetParameters(IntPtr self, string parameter);
static extern (C) IntPtr wxGridCellTextEditor_Clone(IntPtr self);
- static extern (C) string wxGridCellTextEditor_GetValue(IntPtr self);
+ static extern (C) IntPtr wxGridCellTextEditor_GetValue(IntPtr self);
//! \endcond
alias GridCellTextEditor wxGridCellTextEditor;
@@ -464,7 +464,7 @@ public import wx.ScrolledWindow;
}
public override string GetValue()
{
- return wxGridCellTextEditor_GetValue(wxobj).dup;
+ return cast(string) new wxString(wxGridCellTextEditor_GetValue(wxobj), true);
}
}
@@ -482,7 +482,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGridCellNumberEditor_StartingKey(IntPtr self, IntPtr evt);
static extern (C) void wxGridCellNumberEditor_SetParameters(IntPtr self, string parameter);
static extern (C) IntPtr wxGridCellNumberEditor_Clone(IntPtr self);
- static extern (C) string wxGridCellNumberEditor_GetValue(IntPtr self);
+ static extern (C) IntPtr wxGridCellNumberEditor_GetValue(IntPtr self);
//! \endcond
alias GridCellNumberEditor wxGridCellNumberEditor;
@@ -558,7 +558,7 @@ public import wx.ScrolledWindow;
public override string GetValue()
{
- return wxGridCellNumberEditor_GetValue(wxobj).dup;
+ return cast(string) new wxString(wxGridCellNumberEditor_GetValue(wxobj), true);
}
}
@@ -575,7 +575,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGridCellFloatEditor_StartingKey(IntPtr self, IntPtr evt);
static extern (C) void wxGridCellFloatEditor_SetParameters(IntPtr self, string parameter);
static extern (C) IntPtr wxGridCellFloatEditor_Clone(IntPtr self);
- static extern (C) string wxGridCellFloatEditor_GetValue(IntPtr self);
+ static extern (C) IntPtr wxGridCellFloatEditor_GetValue(IntPtr self);
//! \endcond
alias GridCellFloatEditor wxGridCellFloatEditor;
@@ -648,7 +648,7 @@ public import wx.ScrolledWindow;
public override string GetValue()
{
- return wxGridCellFloatEditor_GetValue(wxobj).dup;
+ return cast(string) new wxString(wxGridCellFloatEditor_GetValue(wxobj), true);
}
}
@@ -666,7 +666,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGridCellBoolEditor_Reset(IntPtr self);
static extern (C) void wxGridCellBoolEditor_StartingClick(IntPtr self);
static extern (C) IntPtr wxGridCellBoolEditor_Clone(IntPtr self);
- static extern (C) string wxGridCellBoolEditor_GetValue(IntPtr self);
+ static extern (C) IntPtr wxGridCellBoolEditor_GetValue(IntPtr self);
//! \endcond
alias GridCellBoolEditor wxGridCellBoolEditor;
@@ -736,7 +736,7 @@ public import wx.ScrolledWindow;
public override string GetValue()
{
- return wxGridCellBoolEditor_GetValue(wxobj).dup;
+ return cast(string) new wxString(wxGridCellBoolEditor_GetValue(wxobj), true);
}
}
@@ -753,7 +753,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGridCellChoiceEditor_Reset(IntPtr self);
static extern (C) void wxGridCellChoiceEditor_SetParameters(IntPtr self, string parameter);
static extern (C) IntPtr wxGridCellChoiceEditor_Clone(IntPtr self);
- static extern (C) string wxGridCellChoiceEditor_GetValue(IntPtr self);
+ static extern (C) IntPtr wxGridCellChoiceEditor_GetValue(IntPtr self);
//! \endcond
alias GridCellChoiceEditor wxGridCellChoiceEditor;
@@ -824,7 +824,7 @@ public import wx.ScrolledWindow;
public override string GetValue()
{
- return wxGridCellChoiceEditor_GetValue(wxobj).dup;
+ return cast(string) new wxString(wxGridCellChoiceEditor_GetValue(wxobj), true);
}
}
@@ -1090,8 +1090,8 @@ public import wx.ScrolledWindow;
static extern (C) IntPtr wxGrid_GetLabelFont(IntPtr self);
static extern (C) void wxGrid_GetRowLabelAlignment(IntPtr self, out int horiz, out int vert);
static extern (C) void wxGrid_GetColLabelAlignment(IntPtr self, out int horiz, out int vert);
- static extern (C) string wxGrid_GetRowLabelValue(IntPtr self, int row);
- static extern (C) string wxGrid_GetColLabelValue(IntPtr self, int col);
+ static extern (C) IntPtr wxGrid_GetRowLabelValue(IntPtr self, int row);
+ static extern (C) IntPtr wxGrid_GetColLabelValue(IntPtr self, int col);
static extern (C) IntPtr wxGrid_GetGridLineColour(IntPtr self);
static extern (C) IntPtr wxGrid_GetCellHighlightColour(IntPtr self);
static extern (C) int wxGrid_GetCellHighlightPenWidth(IntPtr self);
@@ -1174,7 +1174,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGrid_SetCellEditor(IntPtr self, int row, int col, IntPtr editor);
static extern (C) IntPtr wxGrid_GetDefaultEditor(IntPtr self);
static extern (C) IntPtr wxGrid_GetCellEditor(IntPtr self, int row, int col);
- static extern (C) string wxGrid_GetCellValue(IntPtr self, int row, int col);
+ static extern (C) IntPtr wxGrid_GetCellValue(IntPtr self, int row, int col);
static extern (C) void wxGrid_SetCellValue(IntPtr self, int row, int col, string s);
static extern (C) bool wxGrid_IsReadOnly(IntPtr self, int row, int col);
static extern (C) void wxGrid_SetReadOnly(IntPtr self, int row, int col, bool isReadOnly);
@@ -1227,7 +1227,7 @@ public import wx.ScrolledWindow;
static extern (C) void wxGrid_SetLabelAlignment(IntPtr self, int orientation, int alignment);
static extern (C) int wxGrid_GetLabelAlignment(IntPtr self, int orientation, int alignment);
static extern (C) void wxGrid_SetLabelValue(IntPtr self, int orientation, string val, int pos);
- static extern (C) string wxGrid_GetLabelValue(IntPtr self, int orientation, int pos);
+ static extern (C) IntPtr wxGrid_GetLabelValue(IntPtr self, int orientation, int pos);
static extern (C) IntPtr wxGrid_GetCellTextFontGrid(IntPtr self);
static extern (C) IntPtr wxGrid_GetCellTextFont(IntPtr self, int row, int col);
static extern (C) void wxGrid_SetCellTextFontGrid(IntPtr self, IntPtr fnt);
@@ -1680,12 +1680,12 @@ public import wx.ScrolledWindow;
public string GetRowLabelValue(int row)
{
- return wxGrid_GetRowLabelValue(wxobj, row).dup;
+ return cast(string) new wxString(wxGrid_GetRowLabelValue(wxobj, row), true);
}
public string GetColLabelValue(int col)
{
- return wxGrid_GetColLabelValue(wxobj, col).dup;
+ return cast(string) new wxString(wxGrid_GetColLabelValue(wxobj, col), true);
}
//-----------------------------------------------------------------------------
@@ -2031,7 +2031,7 @@ public import wx.ScrolledWindow;
public string GetCellValue(int row, int col)
{
- return wxGrid_GetCellValue(wxobj, row, col).dup;
+ return cast(string) new wxString(wxGrid_GetCellValue(wxobj, row, col), true);
}
//-----------------------------------------------------------------------------
@@ -2313,7 +2313,7 @@ version(NOT_IMPLEMENTED){
public string GetLabelValue(int orientation, int pos)
{
- return wxGrid_GetLabelValue(wxobj, orientation, pos).dup;
+ return cast(string) new wxString(wxGrid_GetLabelValue(wxobj, orientation, pos), true);
}
//-----------------------------------------------------------------------------
@@ -3099,22 +3099,22 @@ version(NOT_IMPLEMENTED){
alias int function(GridTableBase obj) Virtual_GetNumberCols;
alias bool function(GridTableBase obj, int row, int col) Virtual_IsEmptyCell;
alias string function(GridTableBase obj, int row, int col) Virtual_GetValue_gt;
- alias void function(GridTableBase obj, int row, int col, string val) Virtual_SetValue;
- alias bool function(GridTableBase obj, int row, int col, string typeName) Virtual_CanGetValueAs;
+ alias void function(GridTableBase obj, int row, int col, IntPtr val) Virtual_SetValue;
+ alias bool function(GridTableBase obj, int row, int col, IntPtr typeName) Virtual_CanGetValueAs;
alias int function(GridTableBase obj, int row, int col) Virtual_GetValueAsLong;
alias double function(GridTableBase obj, int row, int col) Virtual_GetValueAsDouble;
alias void function(GridTableBase obj, int row, int col, int value) Virtual_SetValueAsLong;
alias void function(GridTableBase obj, int row, int col, double value) Virtual_SetValueAsDouble;
alias void function(GridTableBase obj, int row, int col, bool value) Virtual_SetValueAsBool;
- alias IntPtr function(GridTableBase obj, int row, int col, string typeName) Virtual_GetValueAsCustom;
- alias void function(GridTableBase obj, int row, int col, string typeName, IntPtr value) Virtual_SetValueAsCustom;
+ alias IntPtr function(GridTableBase obj, int row, int col, IntPtr typeName) Virtual_GetValueAsCustom;
+ alias void function(GridTableBase obj, int row, int col, IntPtr typeName, IntPtr value) Virtual_SetValueAsCustom;
alias string function(GridTableBase obj, int col) Virtual_GetColLabelValue;
alias void function(GridTableBase obj, IntPtr grid) Virtual_SetView;
alias IntPtr function(GridTableBase obj) Virtual_GetView;
alias void function(GridTableBase obj) Virtual_Clear;
alias bool function(GridTableBase obj, int pos, int numRows) Virtual_InsertRows;
alias bool function(GridTableBase obj, int numRows) Virtual_AppendRows;
- alias void function(GridTableBase obj, int row, string val) Virtual_SetRowLabelValue;
+ alias void function(GridTableBase obj, int row, IntPtr val) Virtual_SetRowLabelValue;
alias void function(GridTableBase obj, IntPtr attrProvider) Virtual_SetAttrProvider;
alias IntPtr function(GridTableBase obj) Virtual_GetAttrProvider;
alias bool function(GridTableBase obj) Virtual_CanHaveAttributes;
@@ -3166,9 +3166,9 @@ version(NOT_IMPLEMENTED){
static extern (C) int wxGridTableBase_GetNumberRows(IntPtr self);
static extern (C) int wxGridTableBase_GetNumberCols(IntPtr self);
static extern (C) bool wxGridTableBase_IsEmptyCell(IntPtr self, int row, int col);
- static extern (C) string wxGridTableBase_GetValue(IntPtr self, int row, int col);
- static extern (C) void wxGridTableBase_SetValue(IntPtr self, int row, int col, string val);
- static extern (C) string wxGridTableBase_GetTypeName(IntPtr self, int row, int col);
+ static extern (C) IntPtr wxGridTableBase_GetValue(IntPtr self, int row, int col);
+ static extern (C) void wxGridTableBase_SetValue(IntPtr self, int row, int col, IntPtr val);
+ static extern (C) IntPtr wxGridTableBase_GetTypeName(IntPtr self, int row, int col);
static extern (C) bool wxGridTableBase_CanGetValueAs(IntPtr self, int row, int col, string typeName);
static extern (C) bool wxGridTableBase_CanSetValueAs(IntPtr self, int row, int col, string typeName);
static extern (C) int wxGridTableBase_GetValueAsLong(IntPtr self, int row, int col);
@@ -3188,8 +3188,8 @@ version(NOT_IMPLEMENTED){
static extern (C) bool wxGridTableBase_InsertCols(IntPtr self, int pos, int numCols);
static extern (C) bool wxGridTableBase_AppendCols(IntPtr self, int numCols);
static extern (C) bool wxGridTableBase_DeleteCols(IntPtr self, int pos, int numCols);
- static extern (C) string wxGridTableBase_GetRowLabelValue(IntPtr self, int row);
- static extern (C) string wxGridTableBase_GetColLabelValue(IntPtr self, int col);
+ static extern (C) IntPtr wxGridTableBase_GetRowLabelValue(IntPtr self, int row);
+ static extern (C) IntPtr wxGridTableBase_GetColLabelValue(IntPtr self, int col);
static extern (C) void wxGridTableBase_SetRowLabelValue(IntPtr self, int row, string val);
static extern (C) void wxGridTableBase_SetColLabelValue(IntPtr self, int col, string val);
static extern (C) void wxGridTableBase_SetAttrProvider(IntPtr self, IntPtr attrProvider);
@@ -3291,12 +3291,12 @@ version(NOT_IMPLEMENTED){
}
public abstract string GetValue(int row, int col);
// {
-// return wxGridTableBase_GetValue(wxobj, row, col).dup;
+// return cast(string) new wxString(wxGridTableBase_GetValue(wxobj, row, col), true);
// }
- static extern (C) private void staticDoSetValue(GridTableBase obj, int row, int col, string val)
+ static extern (C) private void staticDoSetValue(GridTableBase obj, int row, int col, IntPtr val)
{
- obj.SetValue(row, col, val);
+ obj.SetValue(row, col, cast(string) new wxString(val));
}
public abstract void SetValue(int row, int col, string val);
@@ -3312,12 +3312,12 @@ version(NOT_IMPLEMENTED){
}
public /+virtual+/ string GetTypeName(int row, int col)
{
- return wxGridTableBase_GetTypeName(wxobj, row, col).dup;
+ return cast(string) new wxString(wxGridTableBase_GetTypeName(wxobj, row, col), true);
}
- static extern (C) private bool staticDoCanGetValueAs(GridTableBase obj, int row, int col, string typeName)
+ static extern (C) private bool staticDoCanGetValueAs(GridTableBase obj, int row, int col, IntPtr typeName)
{
- return obj.CanGetValueAs(row, col, typeName);
+ return obj.CanGetValueAs(row, col, cast(string) new wxString(typeName));
}
public /+virtual+/ bool CanGetValueAs(int row, int col, string typeName)
@@ -3325,9 +3325,9 @@ version(NOT_IMPLEMENTED){
return wxGridTableBase_CanGetValueAs(wxobj, row, col, typeName);
}
- static extern (C) private bool staticDoCanSetValueAs(GridTableBase obj, int row, int col, string typeName)
+ static extern (C) private bool staticDoCanSetValueAs(GridTableBase obj, int row, int col, IntPtr typeName)
{
- return obj.CanSetValueAs(row, col, typeName);
+ return obj.CanSetValueAs(row, col, cast(string) new wxString(typeName));
}
public /+virtual+/ bool CanSetValueAs(int row, int col, string typeName)
@@ -3395,9 +3395,9 @@ version(NOT_IMPLEMENTED){
//-----------------------------------------------------------------------------
- static extern (C) private IntPtr staticDoGetValueAsCustom(GridTableBase obj, int row, int col, string typeName)
+ static extern (C) private IntPtr staticDoGetValueAsCustom(GridTableBase obj, int row, int col, IntPtr typeName)
{
- return wxObject.SafePtr(obj.GetValueAsCustom(row, col, typeName));
+ return wxObject.SafePtr(obj.GetValueAsCustom(row, col, cast(string) new wxString(typeName)));
}
public /+virtual+/ wxObject GetValueAsCustom(int row, int col, string typeName)
@@ -3405,9 +3405,9 @@ version(NOT_IMPLEMENTED){
return FindObject(wxGridTableBase_GetValueAsCustom(wxobj, row, col, typeName));
}
- static extern (C) private void staticDoSetValueAsCustom(GridTableBase obj, int row, int col, string typeName, IntPtr val)
+ static extern (C) private void staticDoSetValueAsCustom(GridTableBase obj, int row, int col, IntPtr typeName, IntPtr val)
{
- obj.SetValueAsCustom(row, col, typeName, FindObject(val));
+ obj.SetValueAsCustom(row, col, cast(string) new wxString(typeName), FindObject(val));
}
public /+virtual+/ void SetValueAsCustom(int row, int col, string typeName, wxObject val)
@@ -3514,7 +3514,7 @@ version(NOT_IMPLEMENTED){
}
public /+virtual+/ string GetRowLabelValue(int row)
{
- return wxGridTableBase_GetRowLabelValue(wxobj, row).dup;
+ return cast(string) new wxString(wxGridTableBase_GetRowLabelValue(wxobj, row), true);
}
static extern (C) private string staticGetColLabelValue(GridTableBase obj, int col)
@@ -3523,12 +3523,12 @@ version(NOT_IMPLEMENTED){
}
public /+virtual+/ string GetColLabelValue(int col)
{
- return wxGridTableBase_GetColLabelValue(wxobj, col).dup;
+ return cast(string) new wxString(wxGridTableBase_GetColLabelValue(wxobj, col), true);
}
- static extern (C) private void staticDoSetRowLabelValue(GridTableBase obj, int row, string val)
+ static extern (C) private void staticDoSetRowLabelValue(GridTableBase obj, int row, IntPtr val)
{
- obj.SetRowLabelValue(row, val);
+ obj.SetRowLabelValue(row, cast(string) new wxString(val));
}
public /+virtual+/ void SetRowLabelValue(int row, string val)
@@ -3536,9 +3536,9 @@ version(NOT_IMPLEMENTED){
wxGridTableBase_SetRowLabelValue(wxobj, row, val);
}
- static extern (C) private void staticDoSetColLabelValue(GridTableBase obj, int col, string val)
+ static extern (C) private void staticDoSetColLabelValue(GridTableBase obj, int col, IntPtr val)
{
- obj.SetColLabelValue(col, val);
+ obj.SetColLabelValue(col, cast(string) new wxString(val));
}
public /+virtual+/ void SetColLabelValue(int col, string val)
View
76 wx/HTML.d
@@ -51,13 +51,13 @@ public import wx.MouseEvent;
static extern (C) IntPtr wxHtmlTag_GetPreviousSibling(IntPtr self);
static extern (C) IntPtr wxHtmlTag_GetNextSibling(IntPtr self);
static extern (C) IntPtr wxHtmlTag_GetNextTag(IntPtr self);
- static extern (C) string wxHtmlTag_GetName(IntPtr self);
+ static extern (C) IntPtr wxHtmlTag_GetName(IntPtr self);
static extern (C) bool wxHtmlTag_HasParam(IntPtr self, string par);
- static extern (C) string wxHtmlTag_GetParam(IntPtr self, string par, bool with_commas);
+ static extern (C) IntPtr wxHtmlTag_GetParam(IntPtr self, string par, bool with_commas);
static extern (C) bool wxHtmlTag_GetParamAsColour(IntPtr self, string par, IntPtr clr);
static extern (C) bool wxHtmlTag_GetParamAsInt(IntPtr self, string par, inout int clr);
static extern (C) int wxHtmlTag_ScanParam(IntPtr self, string par, string format, IntPtr param);
- static extern (C) string wxHtmlTag_GetAllParams(IntPtr self);
+ static extern (C) IntPtr wxHtmlTag_GetAllParams(IntPtr self);
static extern (C) bool wxHtmlTag_IsEnding(IntPtr self);
static extern (C) bool wxHtmlTag_HasEnding(IntPtr self);
static extern (C) int wxHtmlTag_GetBeginPos(IntPtr self);
@@ -97,7 +97,7 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public string Name() { return wxHtmlTag_GetName(wxobj).dup; }
+ public string Name() { return cast(string) new wxString(wxHtmlTag_GetName(wxobj), true); }
//-----------------------------------------------------------------------------
@@ -108,7 +108,7 @@ public import wx.MouseEvent;
public string GetParam(string par, bool with_commas)
{
- return wxHtmlTag_GetParam(wxobj, par, with_commas).dup;
+ return cast(string) new wxString(wxHtmlTag_GetParam(wxobj, par, with_commas), true);
}
//-----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public string AllParams() { return wxHtmlTag_GetAllParams(wxobj).dup; }
+ public string AllParams() { return cast(string) new wxString(wxHtmlTag_GetAllParams(wxobj), true); }
//-----------------------------------------------------------------------------
@@ -182,7 +182,7 @@ public import wx.MouseEvent;
static extern (C) int wxHtmlCell_GetWidth(IntPtr self);
static extern (C) int wxHtmlCell_GetHeight(IntPtr self);
static extern (C) int wxHtmlCell_GetDescent(IntPtr self);
- static extern (C) string wxHtmlCell_GetId(IntPtr self);
+ static extern (C) IntPtr wxHtmlCell_GetId(IntPtr self);
static extern (C) void wxHtmlCell_SetId(IntPtr self, string id);
static extern (C) IntPtr wxHtmlCell_GetNext(IntPtr self);
static extern (C) void wxHtmlCell_SetPos(IntPtr self, int x, int y);
@@ -246,7 +246,7 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public /+virtual+/ string Id() { return wxHtmlCell_GetId(wxobj).dup; }
+ public /+virtual+/ string Id() { return cast(string) new wxString(wxHtmlCell_GetId(wxobj), true); }
public /+virtual+/ void Id(string value) { wxHtmlCell_SetId(wxobj, value); }
//-----------------------------------------------------------------------------
@@ -603,8 +603,8 @@ public import wx.MouseEvent;
static extern (C) IntPtr wxHtmlLinkInfo_ctor(IntPtr l);
static extern (C) void wxHtmlLinkInfo_SetEvent(IntPtr self, IntPtr e);
static extern (C) void wxHtmlLinkInfo_SetHtmlCell(IntPtr self, IntPtr e);
- static extern (C) string wxHtmlLinkInfo_GetHref(IntPtr self);
- static extern (C) string wxHtmlLinkInfo_GetTarget(IntPtr self);
+ static extern (C) IntPtr wxHtmlLinkInfo_GetHref(IntPtr self);
+ static extern (C) IntPtr wxHtmlLinkInfo_GetTarget(IntPtr self);
static extern (C) IntPtr wxHtmlLinkInfo_GetEvent(IntPtr self);
static extern (C) IntPtr wxHtmlLinkInfo_GetHtmlCell(IntPtr self);
//! \endcond
@@ -638,11 +638,11 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public string Href() { return wxHtmlLinkInfo_GetHref(wxobj).dup; }
+ public string Href() { return cast(string) new wxString(wxHtmlLinkInfo_GetHref(wxobj), true); }
//-----------------------------------------------------------------------------
- public string Target() { return wxHtmlLinkInfo_GetTarget(wxobj).dup; }
+ public string Target() { return cast(string) new wxString(wxHtmlLinkInfo_GetTarget(wxobj), true); }
//-----------------------------------------------------------------------------
@@ -744,7 +744,7 @@ public import wx.MouseEvent;
public override string ReadFile(FSFile file)
{
- return new wxString(wxHtmlFilterPlainText_ReadFile(wxobj, wxObject.SafePtr(file)));
+ return cast(string) new wxString(wxHtmlFilterPlainText_ReadFile(wxobj, wxObject.SafePtr(file)));
}
}
@@ -774,7 +774,7 @@ public import wx.MouseEvent;
public override string ReadFile(FSFile file)
{
- return new wxString(wxHtmlFilterHTML_ReadFile(wxobj, wxObject.SafePtr(file)));
+ return cast(string) new wxString(wxHtmlFilterHTML_ReadFile(wxobj, wxObject.SafePtr(file)));
}*/
}
@@ -859,7 +859,7 @@ public import wx.MouseEvent;
static extern (C) void wxHtmlWinParser_SetFontUnderlined(IntPtr self, int x);
static extern (C) int wxHtmlWinParser_GetFontFixed(IntPtr self);
static extern (C) void wxHtmlWinParser_SetFontFixed(IntPtr self, int x);
- static extern (C) string wxHtmlWinParser_GetFontFace(IntPtr self);
+ static extern (C) IntPtr wxHtmlWinParser_GetFontFace(IntPtr self);
static extern (C) void wxHtmlWinParser_SetFontFace(IntPtr self, string face);
static extern (C) int wxHtmlWinParser_GetAlign(IntPtr self);
static extern (C) void wxHtmlWinParser_SetAlign(IntPtr self, int a);
@@ -995,7 +995,7 @@ public import wx.MouseEvent;
public int FontFixed() { return wxHtmlWinParser_GetFontFixed(wxobj); }
public void FontFixed(int value) { wxHtmlWinParser_SetFontFixed(wxobj, value); }
- public string FontFace() { return wxHtmlWinParser_GetFontFace(wxobj).dup; }
+ public string FontFace() { return cast(string) new wxString(wxHtmlWinParser_GetFontFace(wxobj), true); }
public void FontFace(string value) { wxHtmlWinParser_SetFontFace(wxobj, value); }
//-----------------------------------------------------------------------------
@@ -1052,7 +1052,7 @@ public import wx.MouseEvent;
//! \cond EXTERN
static extern (C) IntPtr wxHtmlEntitiesParser_ctor();
static extern (C) void wxHtmlEntitiesParser_SetEncoding(IntPtr self, int encoding);
- static extern (C) string wxHtmlEntitiesParser_Parse(IntPtr self, string input);
+ static extern (C) IntPtr wxHtmlEntitiesParser_Parse(IntPtr self, string input);
static extern (C) char wxHtmlEntitiesParser_GetEntityChar(IntPtr self, string entity);
static extern (C) char wxHtmlEntitiesParser_GetCharForCode(IntPtr self, uint code);
//! \endcond
@@ -1076,7 +1076,7 @@ public import wx.MouseEvent;
public string Parse(string input)
{
- return wxHtmlEntitiesParser_Parse(wxobj, input).dup;
+ return cast(string) new wxString(wxHtmlEntitiesParser_Parse(wxobj, input), true);
}
//-----------------------------------------------------------------------------
@@ -1108,11 +1108,11 @@ public import wx.MouseEvent;
static extern (C) void wxHtmlParser_AddTagHandler(IntPtr self, IntPtr handler);
static extern (C) void wxHtmlParser_PushTagHandler(IntPtr self, IntPtr handler, string tags);
static extern (C) void wxHtmlParser_PopTagHandler(IntPtr self);
- static extern (C) string wxHtmlParser_GetSource(IntPtr self);
+ static extern (C) IntPtr wxHtmlParser_GetSource(IntPtr self);
static extern (C) void wxHtmlParser_SetSource(IntPtr self, string src);
static extern (C) void wxHtmlParser_SetSourceAndSaveState(IntPtr self, string src);
static extern (C) bool wxHtmlParser_RestoreState(IntPtr self);
- static extern (C) string wxHtmlParser_ExtractCharsetInformation(IntPtr self, string markup);
+ static extern (C) IntPtr wxHtmlParser_ExtractCharsetInformation(IntPtr self, string markup);
//! \endcond
//-----------------------------------------------------------------------------
@@ -1219,7 +1219,7 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public string Source() { return wxHtmlParser_GetSource(wxobj).dup; }
+ public string Source() { return cast(string) new wxString(wxHtmlParser_GetSource(wxobj), true); }
public void Source(string value) { wxHtmlParser_SetSource(wxobj, value); }
public void SourceAndSaveState(string value) { wxHtmlParser_SetSourceAndSaveState(wxobj, value); }
@@ -1233,7 +1233,7 @@ public import wx.MouseEvent;
public string ExtractCharsetInformation(string markup)
{
- return wxHtmlParser_ExtractCharsetInformation(wxobj, markup).dup;
+ return cast(string) new wxString(wxHtmlParser_ExtractCharsetInformation(wxobj, markup), true);
}
}
@@ -1575,10 +1575,10 @@ public import wx.MouseEvent;
//! \cond EXTERN
extern (C) {
alias void function(HtmlWindow obj, IntPtr link) Virtual_OnLinkClicked;
- alias void function(HtmlWindow obj, string title) Virtual_OnSetTitle;
+ alias void function(HtmlWindow obj, IntPtr title) Virtual_OnSetTitle;
alias void function(HtmlWindow obj, IntPtr cell, int x, int y) Virtual_OnCellMouseHover;
alias void function(HtmlWindow obj, IntPtr cell, int x, int y, IntPtr mouseevent) Virtual_OnCellClicked;
- alias int function(HtmlWindow obj, int type, string url, string redirect) Virtual_OnOpeningURL;
+ alias int function(HtmlWindow obj, int type, IntPtr url, IntPtr redirect) Virtual_OnOpeningURL;
}
static extern (C) IntPtr wxHtmlWindow_ctor();
@@ -1593,9 +1593,9 @@ public import wx.MouseEvent;
static extern (C) bool wxHtmlWindow_AppendToPage(IntPtr self, string source);
static extern (C) bool wxHtmlWindow_LoadPage(IntPtr self, string location);
static extern (C) bool wxHtmlWindow_LoadFile(IntPtr self, string filename);
- static extern (C) string wxHtmlWindow_GetOpenedPage(IntPtr self);
- static extern (C) string wxHtmlWindow_GetOpenedAnchor(IntPtr self);
- static extern (C) string wxHtmlWindow_GetOpenedPageTitle(IntPtr self);
+ static extern (C) IntPtr wxHtmlWindow_GetOpenedPage(IntPtr self);
+ static extern (C) IntPtr wxHtmlWindow_GetOpenedAnchor(IntPtr self);
+ static extern (C) IntPtr wxHtmlWindow_GetOpenedPageTitle(IntPtr self);
static extern (C) void wxHtmlWindow_SetRelatedFrame(IntPtr self, IntPtr frame, string format);
static extern (C) IntPtr wxHtmlWindow_GetRelatedFrame(IntPtr self);
static extern (C) void wxHtmlWindow_SetRelatedStatusBar(IntPtr self, int bar);
@@ -1623,9 +1623,9 @@ public import wx.MouseEvent;
static extern (C) void wxHtmlWindow_SelectWord(IntPtr self, inout Point pos);
static extern (C) void wxHtmlWindow_SelectLine(IntPtr self, inout Point pos);
- static extern (C) string wxHtmlWindow_ToText(IntPtr self);
+ static extern (C) IntPtr wxHtmlWindow_ToText(IntPtr self);
- static extern (C) string wxHtmlWindow_SelectionToText(IntPtr self);
+ static extern (C) IntPtr wxHtmlWindow_SelectionToText(IntPtr self);
//! \endcond
//-----------------------------------------------------------------------------
@@ -1702,11 +1702,11 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public string OpenedPage() { return wxHtmlWindow_GetOpenedPage(wxobj).dup; }
+ public string OpenedPage() { return cast(string) new wxString(wxHtmlWindow_GetOpenedPage(wxobj), true); }
- public string OpenedAnchor() { return wxHtmlWindow_GetOpenedAnchor(wxobj).dup; }
+ public string OpenedAnchor() { return cast(string) new wxString(wxHtmlWindow_GetOpenedAnchor(wxobj), true); }
- public string OpenedPageTitle() { return wxHtmlWindow_GetOpenedPageTitle(wxobj).dup; }
+ public string OpenedPageTitle() { return cast(string) new wxString(wxHtmlWindow_GetOpenedPageTitle(wxobj), true); }
//-----------------------------------------------------------------------------
@@ -1809,9 +1809,9 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- static extern(C) private void staticDoOnSetTitle(HtmlWindow obj, string title)
+ static extern(C) private void staticDoOnSetTitle(HtmlWindow obj, IntPtr title)
{
- obj.OnSetTitle(title);
+ obj.OnSetTitle(cast(string) new wxString(title));
}
public /+virtual+/ void OnSetTitle(string title)
@@ -1857,9 +1857,9 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- static extern(C) private int staticDoOnOpeningURL(HtmlWindow obj, int type, string url, string redirect)
+ static extern(C) private int staticDoOnOpeningURL(HtmlWindow obj, int type, IntPtr url, IntPtr redirect)
{
- return cast(int)obj.OnOpeningURL(cast(HtmlURLType) type, url, redirect);
+ return cast(int)obj.OnOpeningURL(cast(HtmlURLType) type, cast(string) new wxString(url), cast(string) new wxString(redirect));
}
public HtmlOpeningStatus OnOpeningURL(HtmlURLType type, string url, string redirect)
@@ -1890,10 +1890,10 @@ public import wx.MouseEvent;
//-----------------------------------------------------------------------------
- public string Text() { return wxHtmlWindow_ToText(wxobj).dup; }
+ public string Text() { return cast(string) new wxString(wxHtmlWindow_ToText(wxobj), true); }
//-----------------------------------------------------------------------------
- public string SelectionText() { return wxHtmlWindow_SelectionToText(wxobj).dup; }
+ public string SelectionText() { return cast(string) new wxString(wxHtmlWindow_SelectionToText(wxobj), true); }
}
View
8 wx/HelpEvent.d
@@ -22,9 +22,9 @@ public import wx.Window;
static extern (C) IntPtr wxHelpEvent_ctor(int type,int winid, inout Point pos);
static extern (C) void wxHelpEvent_GetPosition(IntPtr self, inout Point pos);
static extern (C) void wxHelpEvent_SetPosition(IntPtr self, inout Point pos);
- static extern (C) string wxHelpEvent_GetLink(IntPtr self);
+ static extern (C) IntPtr wxHelpEvent_GetLink(IntPtr self);
static extern (C) void wxHelpEvent_SetLink(IntPtr self, string link);
- static extern (C) string wxHelpEvent_GetTarget(IntPtr self);
+ static extern (C) IntPtr wxHelpEvent_GetTarget(IntPtr self);
static extern (C) void wxHelpEvent_SetTarget(IntPtr self, string target);
//! \endcond
@@ -51,12 +51,12 @@ public import wx.Window;
//-----------------------------------------------------------------------------
- public string Link() { return wxHelpEvent_GetLink(wxobj).dup; }
+ public string Link() { return cast(string) new wxString(wxHelpEvent_GetLink(wxobj), true); }
public void Link(string value) { wxHelpEvent_SetLink(wxobj, value); }
//-----------------------------------------------------------------------------
- public string Target() { return wxHelpEvent_GetTarget(wxobj).dup; }
+ public string Target() { return cast(string) new wxString(wxHelpEvent_GetTarget(wxobj), true); }
public void Target(string value) { wxHelpEvent_SetTarget(wxobj, value); }
View
4 wx/HtmlListBox.d
@@ -45,7 +45,7 @@ public import wx.VLBox;
static extern (C) bool wxHtmlListBox_Create(IntPtr self, IntPtr parent, int id, inout Point pos, inout Size size, int style, string name);
static extern (C) void wxHtmlListBox_RefreshAll(IntPtr self);
static extern (C) void wxHtmlListBox_SetItemCount(IntPtr self, int count);
- static extern (C) string wxHtmlListBox_OnGetItemMarkup(IntPtr self, int n);
+ static extern (C) IntPtr wxHtmlListBox_OnGetItemMarkup(IntPtr self, int n);
static extern (C) IntPtr wxHtmlListBox_GetSelectedTextColour(IntPtr self, IntPtr colFg);
static extern (C) IntPtr wxHtmlListBox_GetSelectedTextBgColour(IntPtr self, IntPtr colBg);
static extern (C) void wxHtmlListBox_OnDrawItem(IntPtr self, IntPtr dc, inout Rectangle rect, int n);
@@ -138,7 +138,7 @@ public import wx.VLBox;
}
protected /+virtual+/ string OnGetItemMarkup(int n)
{
- return wxHtmlListBox_OnGetItemMarkup(wxobj, n).dup;
+ return cast(string) new wxString(wxHtmlListBox_OnGetItemMarkup(wxobj, n), true);
}
//-----------------------------------------------------------------------------
View
20 wx/Image.d
@@ -91,7 +91,7 @@ public import wx.Colour;
static extern (C) void wxImage_SetOption(IntPtr self, string name, string value);
static extern (C) void wxImage_SetOption2(IntPtr self, string name, int value);
- static extern (C) string wxImage_GetOption(IntPtr self, string name);
+ static extern (C) IntPtr wxImage_GetOption(IntPtr self, string name);
static extern (C) int wxImage_GetOptionInt(IntPtr self, string name);
static extern (C) bool wxImage_HasOption(IntPtr self, string name);
@@ -108,7 +108,7 @@ public import wx.Colour;
static extern (C) IntPtr wxImage_FindHandler3(uint imageType);
static extern (C) IntPtr wxImage_FindHandlerMime(string mimetype);
- static extern (C) string wxImage_GetImageExtWildcard();
+ static extern (C) IntPtr wxImage_GetImageExtWildcard();
static extern (C) void wxImage_CleanUpHandlers();
@@ -491,7 +491,7 @@ public import wx.Colour;
public string GetOption(string name)
{
- return wxImage_GetOption(wxobj, name).dup;
+ return cast(string) new wxString(wxImage_GetOption(wxobj, name), true);
}
//---------------------------------------------------------------------
@@ -595,7 +595,7 @@ public import wx.Colour;
//---------------------------------------------------------------------
- static string ImageExtWildcard() { return wxImage_GetImageExtWildcard().dup; }
+ static string ImageExtWildcard() { return cast(string) new wxString(wxImage_GetImageExtWildcard(), true); }
//---------------------------------------------------------------------
@@ -619,10 +619,10 @@ public import wx.Colour;
static extern (C) void wxImageHandler_SetExtension(IntPtr self, string ext);
static extern (C) void wxImageHandler_SetType(IntPtr self, uint type);
static extern (C) void wxImageHandler_SetMimeType(IntPtr self, string type);
- static extern (C) string wxImageHandler_GetName(IntPtr self);
- static extern (C) string wxImageHandler_GetExtension(IntPtr self);
+ static extern (C) IntPtr wxImageHandler_GetName(IntPtr self);
+ static extern (C) IntPtr wxImageHandler_GetExtension(IntPtr self);
static extern (C) uint wxImageHandler_GetType(IntPtr self);
- static extern (C) string wxImageHandler_GetMimeType(IntPtr self);
+ static extern (C) IntPtr wxImageHandler_GetMimeType(IntPtr self);
//! \endcond
//---------------------------------------------------------------------
@@ -635,12 +635,12 @@ public import wx.Colour;
//---------------------------------------------------------------------
- public string Name() { return wxImageHandler_GetName(wxobj).dup; }
+ public string Name() { return cast(string) new wxString(wxImageHandler_GetName(wxobj), true); }
public void Name(string value) { wxImageHandler_SetName(wxobj, value); }
//---------------------------------------------------------------------
- public string Extension() { return wxImageHandler_GetExtension(wxobj).dup; }
+ public string Extension() { return cast(string) new wxString(wxImageHandler_GetExtension(wxobj), true); }
public void Extension(string value) { wxImageHandler_SetExtension(wxobj, value); }
//---------------------------------------------------------------------
@@ -650,7 +650,7 @@ public import wx.Colour;
//---------------------------------------------------------------------
- public string MimeType() { return wxImageHandler_GetMimeType(wxobj).dup; }
+ public string MimeType() { return cast(string) new wxString(wxImageHandler_GetMimeType(wxobj), true); }
public void MimeType(string value) { wxImageHandler_SetMimeType(wxobj, value); }
}
View
8 wx/ListBox.d
@@ -41,9 +41,9 @@ public import wx.ClientData;
static extern (C) void wxListBox_Command(IntPtr self, IntPtr evt);
static extern (C) bool wxListBox_Selected(IntPtr self, int n);
static extern (C) int wxListBox_GetSelection(IntPtr self);
- static extern (C) string wxListBox_GetStringSelection(IntPtr self);
+ static extern (C) IntPtr wxListBox_GetStringSelection(IntPtr self);
static extern (C) void wxListBox_SetSingleString(IntPtr self, int n, string s);
- static extern (C) string wxListBox_GetSingleString(IntPtr self, int n);
+ static extern (C) IntPtr wxListBox_GetSingleString(IntPtr self, int n);
static extern (C) void wxListBox_Append(IntPtr self, string item);
static extern (C) void wxListBox_AppendClientData(IntPtr self, string item, IntPtr cliendData);
static extern (C) void wxListBox_Delete(IntPtr self, int n);
@@ -112,7 +112,7 @@ public import wx.ClientData;
//---------------------------------------------------------------------
- public string StringSelection() { return wxListBox_GetStringSelection(wxobj).dup; }
+ public string StringSelection() { return cast(string) new wxString(wxListBox_GetStringSelection(wxobj), true); }
public void StringSelection(string value) { wxListBox_SetStringSelection(wxobj, value, true); }
//---------------------------------------------------------------------
@@ -138,7 +138,7 @@ public import wx.ClientData;
public string GetString(int n)
{
- return wxListBox_GetSingleString(wxobj, n).dup;
+ return cast(string) new wxString(wxListBox_GetSingleString(wxobj, n), true);
}
public void SetString(int n, string str)
View
16 wx/ListCtrl.d
@@ -32,7 +32,7 @@ public import wx.ImageList;
static extern (C) int wxListItem_GetImage(IntPtr self);
static extern (C) int wxListItem_GetMask(IntPtr self);
static extern (C) int wxListItem_GetState(IntPtr self);
- static extern (C) string wxListItem_GetText(IntPtr self);
+ static extern (C) IntPtr wxListItem_GetText(IntPtr self);
static extern (C) IntPtr wxListItem_GetTextColour(IntPtr self);
static extern (C) int wxListItem_GetWidth(IntPtr self);
static extern (C) void wxListItem_SetAlign(IntPtr self, int alignment);
@@ -129,7 +129,7 @@ public import wx.ImageList;
//---------------------------------------------------------------------
- public string Text() { return wxListItem_GetText(wxobj).dup; }
+ public string Text() { return cast(string) new wxString(wxListItem_GetText(wxobj), true); }
public void Text(string value) { wxListItem_SetText(wxobj, value); }
//---------------------------------------------------------------------
@@ -254,7 +254,7 @@ public import wx.ImageList;
static extern (C) int wxListCtrl_GetItemState(IntPtr self, int item, int stateMask);
static extern (C) bool wxListCtrl_SetItemState(IntPtr self, int item, int state, int stateMask);
static extern (C) bool wxListCtrl_SetItemImage(IntPtr self, int item, int image, int selImage);
- static extern (C) string wxListCtrl_GetItemText(IntPtr self, int item);
+ static extern (C) IntPtr wxListCtrl_GetItemText(IntPtr self, int item);
static extern (C) void wxListCtrl_SetItemText(IntPtr self, int item, string str);
static extern (C) IntPtr wxListCtrl_GetItemData(IntPtr self, int item);
static extern (C) bool wxListCtrl_SetItemData(IntPtr self, int item, IntPtr data);
@@ -474,7 +474,7 @@ public import wx.ImageList;
public string GetItemText(int item)
{
- return wxListCtrl_GetItemText(wxobj, item).dup;
+ return cast(string) new wxString(wxListCtrl_GetItemText(wxobj, item), true);
}
//---------------------------------------------------------------------
@@ -903,12 +903,12 @@ public import wx.ImageList;
//! \cond EXTERN
static extern (C) IntPtr wxListEvent_ctor(int commandType, int id);
static extern (C) IntPtr wxListEvent_GetItem(IntPtr self);
- static extern (C) string wxListEvent_GetLabel(IntPtr self);
+ static extern (C) IntPtr wxListEvent_GetLabel(IntPtr self);
static extern (C) int wxListEvent_GetIndex(IntPtr self);
static extern (C) int wxListEvent_GetKeyCode(IntPtr self);
static extern (C) int wxListEvent_GetColumn(IntPtr self);
static extern (C) void wxListEvent_GetPoint(IntPtr self, inout Point pt);
- static extern (C) string wxListEvent_GetText(IntPtr self);
+ static extern (C) IntPtr wxListEvent_GetText(IntPtr self);
static extern (C) int wxListEvent_GetImage(IntPtr self);
static extern (C) int wxListEvent_GetData(IntPtr self);
static extern (C) int wxListEvent_GetMask(IntPtr self);
@@ -935,7 +935,7 @@ public import wx.ImageList;
static Event New(IntPtr ptr) { return new ListEvent(ptr); }
//-----------------------------------------------------------------------------
- public string Label() { return wxListEvent_GetLabel(wxobj).dup; }
+ public string Label() { return cast(string) new wxString(wxListEvent_GetLabel(wxobj), true); }
//-----------------------------------------------------------------------------
@@ -963,7 +963,7 @@ public import wx.ImageList;
//---------------------------------------------------------------------
- public string Text() { return wxListEvent_GetText(wxobj).dup; }
+ public string Text() { return cast(string) new wxString(wxListEvent_GetText(wxobj), true); }