Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21869/wxLua/bindings/wxwidgets
Modified Files:
datetime.i dialogs.i
Log Message:
Replace wxDirSelectorPromptStr, wxFileSelectorPromptStr with wxT("value") for MingW 3.4.5
Fix wxLocale::GetString to use const wxChar* instead of wxString since MingW 3.4.5 doesn't
that that an emptystring evalues to NULL
Index: datetime.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** datetime.i 27 Jun 2007 03:11:27 -0000 1.37
--- datetime.i 27 Jun 2007 15:57:13 -0000 1.38
***************
*** 895,901 ****
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
! virtual wxString GetString(const wxString& szOrigString, const wxString& szDomain = "") const;
// plural form version of the same:
! virtual wxString GetString(const wxString& szOrigString, const wxString& szOrigString2, size_t n, const wxString& szDomain = "") const;
// Returns the current short name for the locale
--- 895,901 ----
// domains are searched in the last to first order, i.e. catalogs
// added later override those added before.
! virtual wxString GetString(const wxString& szOrigString, const wxChar* szDomain = NULL) const;
// plural form version of the same:
! virtual wxString GetString(const wxString& szOrigString, const wxString& szOrigString2, size_t n, const wxChar* szDomain = NULL) const;
// Returns the current short name for the locale
Index: dialogs.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** dialogs.i 25 Jun 2007 03:19:37 -0000 1.37
--- dialogs.i 27 Jun 2007 15:57:13 -0000 1.38
***************
*** 52,56 ****
// %function wxTipProvider* wxCreateFileTipProvider(const wxString& filename, size_t currentTip)
! %define_string wxDirSelectorPromptStr
%function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
%function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
--- 52,56 ----
// %function wxTipProvider* wxCreateFileTipProvider(const wxString& filename, size_t currentTip)
! %define_string wxDirSelectorPromptStr wxT("Select a directory")
%function wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, const wxString& default_path = "", long style = wxDD_DEFAULT_STYLE, const wxPoint& pos = wxDefaultPosition, wxWindow *parent = NULL)
%function wxString wxFileSelector(const wxString& message, const wxString& default_path = "", const wxString& default_filename = "", const wxString& default_extension = "", const wxString& wildcard = "*.*", int flags = 0, wxWindow *parent = NULL, int x = -1, int y = -1)
***************
*** 232,236 ****
%include "wx/filedlg.h"
! %define_string wxFileSelectorPromptStr
%define_string wxFileSelectorDefaultWildcardStr
--- 232,236 ----
%include "wx/filedlg.h"
! %define_string wxFileSelectorPromptStr wxT("Select a file")
%define_string wxFileSelectorDefaultWildcardStr
|
