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

Committing in .

Browse Source 
Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
                 OpenVMS build update
 	wxWidgets/include/wx/unix/glx11.h
                 Removed superfluous semi-colon
 	wxWidgets/samples/db/dbtest.cpp
 	wxWidgets/samples/db/listdb.cpp
                fixed wxString cast problems
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen
2007-04-20 08:16:48 +00:00
parent dedead3227
commit 047b6c71d6
5 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
descrip.mms
View File

@@ -2,7 +2,7 @@
# * # *
# Make file for VMS * # Make file for VMS *
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * # Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
# Date : 19 September 2006 * # Date : 19 April 2007 *
# * # *
#***************************************************************************** #*****************************************************************************
.first .first
@@ -15,7 +15,6 @@
all : all :
set default [.include.wx] set default [.include.wx]
if f$search("DEPRECATED.DIR") .eqs. "" then set file/enter=[]deprecated.dir [--.contrib.include.wx]deprecated.dir
set default [--] set default [--]
make gtk make gtk
purge [...] purge [...]
@@ -33,23 +32,28 @@ all :
gtk : [.include.wx]setup.h gtk : [.include.wx]setup.h
set default [.src.generic] set default [.src.generic]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
set default [-.common] set default [-.common]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
set default [-.html] set default [-.html]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
set default [-.xml] set default [-.xml]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
set default [-.aui] set default [-.aui]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [-.xrc] set default [-.xrc]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
set default [-.unix] set default [-.unix]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
set default [-.gtk1] set default [-.gtk1]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [--.contrib.src.deprecated] library [--.lib]libwx_gtk.olb [.CXX_REPOSITORY]*.obj
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) set default [--.demos.bombs]
set default [---.demos.bombs]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
set default [--.samples.calendar] set default [--.samples.calendar]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
@@ -95,23 +99,28 @@ gtk2 : [.include.wx]setup.h
@gnome$root:[000000]glib2 @gnome$root:[000000]glib2
set default [.src.generic] set default [.src.generic]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
set default [-.common] set default [-.common]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
set default [-.html] set default [-.html]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
set default [-.aui] set default [-.aui]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
set default [-.xml] set default [-.xml]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
set default [-.xrc] set default [-.xrc]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
set default [-.unix] set default [-.unix]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
set default [-.gtk] set default [-.gtk]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
set default [--.contrib.src.deprecated] library [--.lib]libwx_gtk2.olb [.CXX_REPOSITORY]*.obj
$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) set default [--.demos.bombs]
set default [---.demos.bombs]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
set default [--.samples.calendar] set default [--.samples.calendar]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK2__=1)
@@ -153,25 +162,31 @@ gtk2 : [.include.wx]setup.h
x11 : [.include.wx]setup.h x11 : [.include.wx]setup.h
set default [.src.generic] set default [.src.generic]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.common] set default [-.common]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.html] set default [-.html]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.xml] set default [-.xml]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.xrc] set default [-.xrc]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.aui] set default [-.aui]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [-.unix] set default [-.unix]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.x11] set default [-.x11]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
set default [-.univ] set default [-.univ]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [--.contrib.src.deprecated] library [--.lib]libwx_x11_univ.olb [.CXX_REPOSITORY]*.obj
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) set default [--.demos.bombs]
set default [---.demos.bombs]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
set default [--.samples.calendar] set default [--.samples.calendar]
# $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1) # $(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
@@ -212,19 +227,23 @@ x11 : [.include.wx]setup.h
motif : [.include.wx]setup.h motif : [.include.wx]setup.h
set default [.src.generic] set default [.src.generic]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.common] set default [-.common]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.unix] set default [-.unix]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.aui] set default [-.aui]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.motif] set default [-.motif]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
set default [-.x11] set default [-.x11]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
set default [--.contrib.src.deprecated] library [--.lib]libwx_motif.olb [.CXX_REPOSITORY]*.obj
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) set default [--.demos.bombs]
set default [---.demos.bombs]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)
set default [--.samples.calendar] set default [--.samples.calendar]
$(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1) $(MMS)$(MMSQUALIFIERS)/macro=(__WXMOTIF__=1)

2
include/wx/unix/glx11.h
View File

@@ -155,7 +155,7 @@ public:
} }
private: private:
DECLARE_DYNAMIC_CLASS(wxGLApp); DECLARE_DYNAMIC_CLASS(wxGLApp)
}; };
#endif // _WX_UNIX_GLX11_H_ #endif // _WX_UNIX_GLX11_H_

4
samples/db/dbtest.cpp
View File

@@ -1374,8 +1374,8 @@ void CeditorDlg::OnCommand(wxWindow& win, wxCommandEvent& WXUNUSED(event))
// Display the query dialog box // Display the query dialog box
wxChar qryWhere[DB_MAX_WHERE_CLAUSE_LEN+1]; wxChar qryWhere[DB_MAX_WHERE_CLAUSE_LEN+1];
wxStrcpy(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr); wxStrcpy(qryWhere, (const wxChar*) wxGetApp().Contact->qryWhereStr);
wxChar *tblName[] = {(wxChar *)CONTACT_TABLE_NAME.c_str(), 0}; const wxChar *tblName[] = {(const wxChar *)CONTACT_TABLE_NAME.c_str(), 0};
new CqueryDlg(GetParent(), wxGetApp().Contact->GetDb(), tblName, qryWhere); new CqueryDlg(GetParent(), wxGetApp().Contact->GetDb(), (wxChar**) tblName, qryWhere);
// Query the first record in the new record set and // Query the first record in the new record set and
// display it, if the query string has changed. // display it, if the query string has changed.

2
samples/db/listdb.cpp
View File

@@ -362,7 +362,7 @@ ClookUpDlg::ClookUpDlg(wxWindow *parent, const wxString &windowTitle, const wxSt
} }
// Query the actual record set // Query the actual record set
if (selectStmt && wxStrlen(selectStmt)) // Query by sql stmt passed in if ( (const char*) selectStmt && wxStrlen(selectStmt)) // Query by sql stmt passed in
{ {
if (!lookup2->QueryBySqlStmt(selectStmt)) if (!lookup2->QueryBySqlStmt(selectStmt))
{ {

9
setup.h_vms
View File

@@ -3,7 +3,7 @@
* Template for the set.h file for VMS * * Template for the set.h file for VMS *
* Created from setup.h_in * * Created from setup.h_in *
* Author : J.Jansen (joukj@hrem.nano.tudelft.nl) * * Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
* Date : 19 December 2006 * * Date : 17 April 2007 *
* * * *
*****************************************************************************/ *****************************************************************************/
@@ -328,6 +328,8 @@ typedef pid_t GPid;
#define wxUSE_TIPWINDOW 1 #define wxUSE_TIPWINDOW 1
#define wxUSE_STC 1
#define wxUSE_ANIMATIONCTRL 1 #define wxUSE_ANIMATIONCTRL 1
#define wxUSE_BUTTON 1 #define wxUSE_BUTTON 1
#define wxUSE_BMPBUTTON 1 #define wxUSE_BMPBUTTON 1
@@ -587,6 +589,8 @@ typedef pid_t GPid;
#define wxUSE_UNICODE_MSLU 0 #define wxUSE_UNICODE_MSLU 0
#define wxUSE_UNICODE_UTF8 0
#define wxUSE_DC_CACHEING 1 #define wxUSE_DC_CACHEING 1
#define wxUSE_GADGETS 1 #define wxUSE_GADGETS 1
@@ -990,9 +994,6 @@ typedef pid_t GPid;
/* define if you have vsscanf function */ /* define if you have vsscanf function */
#undef HAVE_VSSCANF #undef HAVE_VSSCANF
/* The number of bytes in a char. */
#define SIZEOF_CHAR 1
/* The number of bytes in a wchar_t. */ /* The number of bytes in a wchar_t. */
#define SIZEOF_WCHAR_T 4 #define SIZEOF_WCHAR_T 4