Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 05:15:41 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Compile and build fixes for wxGTK and wxMotif

Browse Source 
Removed somw more warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-11-08 16:42:20 +00:00
parent 87d1e11fd4
commit d18ed59a36
9 changed files with 242 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+89 -123
View File
File diff suppressed because it is too large Load Diff
configure.in
+17 -20
View File
@@ -269,6 +269,8 @@ SEARCH_INCLUDE="\
/usr/lpp/Xamples/include \
\
/usr/local/include/gtk \
/usr/local/include/Xm \
/usr/local/include/qt \
/usr/X11R6/include/Xm \
/usr/X11/include/Xm \
/usr/include/qt \
@@ -670,7 +672,6 @@ DEFAULT_wxUSE_APPLE_IEEE=1
DEFAULT_wxUSE_IOSTREAMH=1
DEFAULT_wxUSE_ZLIB=1
DEFAULT_wxUSE_GDK_IMLIB=1
DEFAULT_wxUSE_LIBPNG=1
DEFAULT_wxUSE_ODBC=0
@@ -780,10 +781,6 @@ AC_OVERRIDES(zlib,zlib,
**--with-zlib use zlib for LZW comression,
wxUSE_ZLIB)
AC_OVERRIDES(gdk_imlib,gdk_imlib,
**--with-gdk_imlib use Raster's gdk_imlib (Image library),
wxUSE_GDK_IMLIB)
AC_OVERRIDES(libpng,libpng,
**--with-libpng use libpng (PNG image format),
wxUSE_LIBPNG)
@@ -962,19 +959,19 @@ dnl ----------------------------------------------------------------
dnl
dnl AC_OVERRIDES(metafile, metafile,
dnl **--with-metafile use metafile (no effect),
dnl wxwxUSE_METAFILE)
dnl wxUSE_METAFILE)
dnl
dnl AC_OVERRIDES(help,help,
dnl **--with-help use help (no effect),
dnl wxwxUSE_HELP)
dnl wxUSE_HELP)
dnl
dnl AC_OVERRIDES(wxgraph,wxgraph,
dnl **--with-wxgraph use wxgraph (no effect),
dnl wxwxUSE_WXGRAPH)
dnl wxUSE_WXGRAPH)
dnl
dnl AC_OVERRIDES(wxtree,wxtree,
dnl **--with-wxtree use wxtree (no effect),
dnl wxwxUSE_WXTREE)
dnl wxUSE_WXTREE)
dnl
dnl AC_OVERRIDES(package,message,helpmessage,variable)
dnl
@@ -1143,10 +1140,6 @@ if test "$wxUSE_ZLIB" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
fi
if test "$wxUSE_GDK_IMLIB" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_GDK_IMLIB,$wxUSE_GDK_IMLIB)
fi
if test "$wxUSE_LIBPNG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG)
fi
@@ -1362,19 +1355,19 @@ dnl ----------------------------------------------------------------
dnl thread support
dnl ----------------------------------------------------------------
wxwxUSE_THREADS=1
wxUSE_THREADS=1
THREADS_LINK=""
UNIX_THREAD="gtk/threadno.cpp"
AC_OVERRIDES(threads,threads,
**--without-threads Force disabling threads,
wxwxUSE_THREADS)
wxUSE_THREADS)
dnl AC_ARG_WITH(threads,
dnl [**--without-threads Force disabling threads ],
dnl [wxwxUSE_THREADS="$withval"])
dnl [wxUSE_THREADS="$withval"])
if test "$wxwxUSE_THREADS" = "1"; then
if test "$wxUSE_THREADS" = "1"; then
UNIX_THREAD="gtk/threadno.cpp"
dnl For glibc 2 users who have the old libc 5 too
@@ -1401,17 +1394,21 @@ if test "$wxwxUSE_THREADS" = "1"; then
])
fi
if test "$wxUSE_MOTIF" = "1"; then
UNIX_THREAD="motif/thread.cpp"
fi
if test -z "$UNIX_THREAD"; then
wxwxUSE_THREADS=0
wxUSE_THREADS=0
fi
AC_SUBST(UNIX_THREAD)
AC_SUBST(THREADS_LINK)
AC_DEFINE(wxwxUSE_THREADS)
AC_DEFINE(wxUSE_THREADS)
dnl defines UNIX_THREAD it contains the source file to use for threads. (GL)
dnl defines THREADS_LINK it contains the thread library to link with. (GL)
dnl defines wxwxUSE_THREADS if thread support is activated. (GL)
dnl defines wxUSE_THREADS if thread support is activated. (GL)
dnl ----------------------------------------------------------------
dnl search for opengl
include/wx/motif/window.h
+1 -1
View File
@@ -369,7 +369,7 @@ public:
// Does this window want to accept keyboard focus?
virtual bool AcceptsFocus() const;
virtual void PrepareDC( wxDC &dc ) {};
virtual void PrepareDC( wxDC &WXUNUSED(dc) ) {};
public:
samples/notebook/test.cpp
-9
View File
@@ -50,9 +50,6 @@ bool MyApp::OnInit(void)
void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
{
int dialogWidth = 365;
int dialogHeight = 390;
m_okButton = new wxButton(window, wxID_OK, "Close", wxPoint(-1, -1), wxSize(80, 25));
m_cancelButton = new wxButton(window, wxID_CANCEL, "Cancel", wxPoint(-1, -1), wxSize(80, 25));
m_helpButton = new wxButton(window, wxID_HELP, "Help", wxPoint(-1, -1), wxSize(80, 25));
@@ -131,9 +128,6 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
void MyDialog::Init(void)
{
int dialogWidth = 365;
int dialogHeight = 390;
m_notebook = new wxNotebook(this, ID_NOTEBOOK);
wxLayoutConstraints* c = new wxLayoutConstraints;
@@ -179,9 +173,6 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
void MyFrame::Init(void)
{
int dialogWidth = 365;
int dialogHeight = 390;
m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxCLIP_CHILDREN);
// Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
samples/tab/test.cpp
-6
View File
@@ -50,9 +50,6 @@ bool MyApp::OnInit(void)
void MyApp::InitTabView(wxPanelTabView* view, wxWindow* window)
{
int dialogWidth = 365;
int dialogHeight = 390;
m_okButton = new wxButton(window, wxID_OK, "Close", wxPoint(-1, -1), wxSize(80, 25));
m_cancelButton = new wxButton(window, wxID_CANCEL, "Cancel", wxPoint(-1, -1), wxSize(80, 25));
m_helpButton = new wxButton(window, wxID_HELP, "Help", wxPoint(-1, -1), wxSize(80, 25));
@@ -210,9 +207,6 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
void MyFrame::Init(void)
{
int dialogWidth = 365;
int dialogHeight = 390;
m_panel = new wxTabbedPanel(this, -1);
// Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
samples/treectrl/treetest.cpp
+1 -1
View File
@@ -238,7 +238,7 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
}
}
void MyTreeCtrl::OnKeyDown(wxTreeEvent& event)
void MyTreeCtrl::OnKeyDown(wxTreeEvent& WXUNUSED(event))
{
// show some info about this item
wxTreeItemId itemId = GetSelection();
samples/wxsocket/server.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ MyFrame::~MyFrame()
}
// Intercept menu commands
void MyFrame::Menu_Exit(wxCommandEvent& event)
void MyFrame::Menu_Exit(wxCommandEvent& WXUNUSED(event))
{
Close(TRUE);
}
setup/setup.hin
-4
View File
@@ -43,10 +43,6 @@
* Use zlib
*/
#undef wxUSE_ZLIB
/*
* Use gdk_imlib
*/
#undef wxUSE_GDK_IMLIB
/*
* Use libpng
*/
src/motif.inc
+133 -17
View File
@@ -10,8 +10,140 @@ LIB_MINOR=1
LIB_CPP_SRC=\
\
common/cmndata.cpp \
common/config.cpp \
common/date.cpp \
common/docmdi.cpp \
common/docview.cpp \
common/dynarray.cpp \
common/dynlib.cpp \
common/event.cpp \
common/file.cpp \
common/fileconf.cpp \
common/filefn.cpp \
common/gdicmn.cpp \
common/hash.cpp \
common/helpbase.cpp \
common/intl.cpp \
common/image.cpp \
common/ipcbase.cpp \
common/layout.cpp \
common/list.cpp \
common/log.cpp \
common/matrix.cpp \
common/memory.cpp \
common/module.cpp \
common/object.cpp \
common/postscrp.cpp \
common/prntbase.cpp \
common/resource.cpp \
common/serbase.cpp \
common/string.cpp \
common/textfile.cpp \
common/time.cpp \
common/timercmn.cpp \
common/utilscmn.cpp \
common/wincmn.cpp \
common/framecmn.cpp \
common/stream.cpp \
common/datstrm.cpp \
common/fstream.cpp \
common/mstream.cpp \
common/zstream.cpp \
common/objstrm.cpp \
common/sckstrm.cpp \
common/validate.cpp \
common/valtext.cpp \
common/variant.cpp \
common/wxexpr.cpp \
common/socket.cpp \
common/sckaddr.cpp \
common/sckipc.cpp \
common/protocol.cpp \
common/ftp.cpp \
common/http.cpp \
common/url.cpp \
common/tokenzr.cpp \
\
motif/accel.cpp \
motif/app.cpp \
motif/bitmap.cpp \
motif/bmpbuttn.cpp \
motif/brush.cpp \
motif/button.cpp \
motif/checkbox.cpp \
motif/chcklst.cpp \
motif/choice.cpp \
motif/clipbrd.cpp \
motif/colordlg.cpp \
motif/colour.cpp \
motif/control.cpp \
motif/combobox.cpp \
motif/cursor.cpp \
motif/data.cpp \
motif/dc.cpp \
motif/dcclient.cpp \
motif/dcmemory.cpp \
motif/dcscreen.cpp \
motif/dnd.cpp \
motif/dirdlg.cpp \
motif/dialog.cpp \
motif/filedlg.cpp \
motif/font.cpp \
motif/fontdlg.cpp \
motif/frame.cpp \
motif/gauge.cpp \
motif/gdiobj.cpp \
motif/icon.cpp \
motif/listbox.cpp \
motif/main.cpp \
motif/mdi.cpp \
motif/menu.cpp \
motif/menuitem.cpp \
motif/msgdlg.cpp \
motif/notebook.cpp \
motif/palette.cpp \
motif/pen.cpp \
motif/print.cpp \
motif/printdlg.cpp \
motif/radiobox.cpp \
motif/radiobut.cpp \
motif/region.cpp \
motif/scrolbar.cpp \
motif/settings.cpp \
motif/spinbutt.cpp \
motif/slider.cpp \
motif/statbox.cpp \
motif/statbmp.cpp \
motif/stattext.cpp \
motif/toolbar.cpp \
motif/textctrl.cpp \
motif/timer.cpp \
motif/utils.cpp \
motif/utilsexc.cpp \
motif/window.cpp \
\
generic/choicdgg.cpp \
generic/colrdlgg.cpp \
generic/fontdlgg.cpp \
generic/gridg.cpp \
generic/imaglist.cpp \
generic/listctrl.cpp \
generic/laywin.cpp \
generic/msgdlgg.cpp \
generic/panelg.cpp \
generic/printps.cpp \
generic/prntdlgg.cpp \
generic/sashwin.cpp \
generic/scrolwin.cpp \
generic/splitter.cpp \
generic/statusbr.cpp \
generic/tabg.cpp \
generic/textdlgg.cpp \
generic/treectrl.cpp
LIB_C_SRC=\
common/extended.c \
\
png/png.c \
png/pngset.c \
@@ -43,19 +175,3 @@ LIB_C_SRC=\
zlib/infcodes.c \
zlib/infutil.c \
zlib/inffast.c \
\
iodbc/dlf.c \
iodbc/dlproc.c \
iodbc/herr.c \
iodbc/henv.c \
iodbc/hdbc.c \
iodbc/hstmt.c \
iodbc/connect.c \
iodbc/prepare.c \
iodbc/result.c \
iodbc/execute.c \
iodbc/fetch.c \
iodbc/info.c \
iodbc/catalog.c \
iodbc/misc.c \
iodbc/itrace.c