AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure and #ifdef wxUSE_XXX updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1999-01-04 13:52:06 +00:00
parent 9ca2fe7ee6
commit ac57418f39
56 changed files with 670 additions and 1567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1443
configure vendored
View File

File diff suppressed because it is too large Load Diff

293
configure.in
View File

@ -580,7 +580,6 @@ dnl ------------------------------------------------------------------------
USE_UNIX=1
USE_LINUX=
USE_SGI=
USE_HPUX=
@ -698,24 +697,11 @@ DEFAULT_wxUSE_ZLIB=1
DEFAULT_wxUSE_LIBPNG=1
DEFAULT_wxUSE_ODBC=1
DEFAULT_wxUSE_COMBOBOX=1
DEFAULT_wxUSE_GAUGE=1
DEFAULT_wxUSE_SCROLLBAR=1
DEFAULT_wxUSE_LISTCTRL=1
DEFAULT_wxUSE_TREECTRL=1
DEFAULT_wxUSE_GRID=1
DEFAULT_wxUSE_TAB_DIALOG=1
DEFAULT_wxUSE_NOTEBOOK=1
DEFAULT_wxUSE_TIMEDATE=1
DEFAULT_wxUSE_FRACTION=1
DEFAULT_wxUSE_LOG=1
DEFAULT_wxUSE_INTL=1
DEFAULT_wxUSE_CONFIG=1
DEFAULT_wxUSE_STREAMS=1
DEFAULT_wxUSE_SERIAL=1
DEFAULT_wxUSE_FILE=1
DEFAULT_wxUSE_TEXTFILE=1
DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
DEFAULT_WX_NORMALIZED_PS_FONTS=1
@ -723,9 +709,8 @@ DEFAULT_wxUSE_POSTSCRIPT=1
DEFAULT_wxUSE_IPC=1
DEFAULT_wxUSE_RESOURCES=1
DEFAULT_wxUSE_CONSTRAINTS=1
DEFAULT_wxUSE_CLIPBOARD=1
DEFAULT_wxUSE_DND=1
DEFAULT_wxUSE_DRAG_AND_DROP=1
DEFAULT_wxUSE_MDI_ARCHITECTURE=1
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
@ -734,11 +719,6 @@ DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1
DEFAULT_wxUSE_PROLOGIO=1
DEFAULT_wxUSE_WX_RESOURCES=1
DEFAULT_wxUSE_RPC=0
DEFAULT_wxUSE_OPENGL=0
DEFAULT_wxUSE_METAFILE=0
DEFAULT_wxUSE_WXGRAPH=0
DEFAULT_wxUSE_WXTREE=0
DEFAULT_wxUSE_HELP=1
DEFAULT_wxUSE_UNICODE=1
@ -800,6 +780,10 @@ AC_OVERRIDES(apple_ieee, apple_ieee,
**--with_apple_ieee use the Apple IEEE codec,
wxUSE_APPLE_IEEE)
AC_OVERRIDES(threads,threads,
**--with-threads for enabling threads,
wxUSE_THREADS)
dnl ----------------------------------------------------------------
dnl user options for libraries
dnl ----------------------------------------------------------------
@ -816,46 +800,6 @@ AC_OVERRIDES(odbc,odbc,
**--with-odbc use iODBC and wxODBC classes,
wxUSE_ODBC)
AC_OVERRIDES(opengl,opengl,
**--with-opengl use OpenGL (or Mesa),
wxUSE_OPENGL)
dnl ----------------------------------------------------------------
dnl user options for GUI control classes
dnl ----------------------------------------------------------------
AC_OVERRIDES(gauge,gauge,
**--with-gauge use wxGauge class,
wxUSE_GAUGE)
AC_OVERRIDES(combobox,combobox,
**--with-combobox use wxComboBox class,
wxUSE_COMBOBOX)
AC_OVERRIDES(scrollbar,scrollbar,
**--with-scrollbar use wxScrollbar class,
wxUSE_SCROLLBAR)
AC_OVERRIDES(listctrl,listctrl,
**--with-listctrl use wxListCtrl class,
wxUSE_LISTCTRL)
AC_OVERRIDES(treectrl,treectrl,
**--with-treectrl use wxTreeCtrl class,
wxUSE_TREECTRL)
AC_OVERRIDES(grid,grid,
**--with-grid use wxGrid class,
wxUSE_GRID)
AC_OVERRIDES(tab_dialog,tab_dialog,
**--with-tab_dialog use wxTabDia class,
wxUSE_TAB_DIALOG)
AC_OVERRIDES(notebook,notebook,
**--with-notebook use wxNotebook class,
wxUSE_NOTEBOOK)
dnl ----------------------------------------------------------------
dnl user options for non-GUI classes
dnl ----------------------------------------------------------------
@ -864,14 +808,6 @@ AC_OVERRIDES(timedate, timedate,
**--with-timedate use wxTime and wxDate classes,
wxUSE_TIMEDATE)
AC_OVERRIDES(fraction,fraction,
**--with-fraction use wxFraction class,
wxUSE_FRACTION)
AC_OVERRIDES(log,log,
**--with-log use logging system,
wxUSE_LOG)
AC_OVERRIDES(intl,intl,
**--with-intl use internationalization system,
wxUSE_INTL)
@ -888,14 +824,6 @@ AC_OVERRIDES(serial,serial,
**--with-serial use class serialization,
wxUSE_SERIAL)
AC_OVERRIDES(file,file,
**--with-file use wxFile class,
wxUSE_FILE)
AC_OVERRIDES(textfile,textfile,
**--with-textfile use wxTextFile class,
wxUSE_TEXTFILE)
dnl ----------------------------------------------------------------
dnl user options for PostScript
dnl ----------------------------------------------------------------
@ -958,11 +886,7 @@ wxUSE_CLIPBOARD)
AC_OVERRIDES(dnd,dnd,
**--with-dnd use Drag'n'Drop classes,
wxUSE_DND)
AC_OVERRIDES(constraints,constrains,
**--with-constraints use layout-constraints system,
wxUSE_CONSTRAINTS)
wxUSE_DRAG_AND_DROP)
dnl ----------------------------------------------------------------
dnl user options for architectures
@ -984,24 +908,6 @@ AC_OVERRIDES(help,help,
**--with-help use help (using external browser at present),
wxUSE_HELP)
dnl ----------------------------------------------------------------
dnl user options with no effect yet
dnl ----------------------------------------------------------------
dnl
dnl AC_OVERRIDES(metafile, metafile,
dnl **--with-metafile use metafile (no effect),
dnl wxUSE_METAFILE)
dnl
dnl AC_OVERRIDES(wxgraph,wxgraph,
dnl **--with-wxgraph use wxgraph (no effect),
dnl wxUSE_WXGRAPH)
dnl
dnl AC_OVERRIDES(wxtree,wxtree,
dnl **--with-wxtree use wxtree (no effect),
dnl wxUSE_WXTREE)
dnl
dnl AC_OVERRIDES(package,message,helpmessage,variable)
dnl
dnl ----------------------------------------------------------------
dnl Unix, obviously
dnl ----------------------------------------------------------------
@ -1201,11 +1107,15 @@ dnl ----------------------------------------------------------------
if test "$wxUSE_ZLIB" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_ZLIB,$wxUSE_ZLIB)
Z_C_SRC="\$(Z_C_SRC)"
fi
AC_SUBST(Z_C_SRC)
if test "$wxUSE_LIBPNG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LIBPNG,$wxUSE_LIBPNG)
PNG_C_SRC="\$(PNG_C_SRC)"
fi
AC_SUBST(PNG_C_SRC)
IODBC_C_SRC=""
if test "$wxUSE_ODBC" = 1 ; then
@ -1214,42 +1124,6 @@ if test "$wxUSE_ODBC" = 1 ; then
fi
AC_SUBST(IODBC_C_SRC)
dnl ----------------------------------------------------------------
dnl Register GUI-control options for makefiles and setup.h
dnl ----------------------------------------------------------------
if test "$wxUSE_GAUGE" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_GAUGE,$wxUSE_GAUGE)
fi
if test "$wxUSE_COMBOBOX" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_COMBOBOX,$wxUSE_COMBOBOX)
fi
if test "$wxUSE_SCROLLBAR" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_SCROLLBAR,$wxUSE_SCROLLBAR)
fi
if test "$wxUSE_LISTCTRL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LISTCTRL,$wxUSE_LISTCTRL)
fi
if test "$wxUSE_TREECTRL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_TREECTRL,$wxUSE_TREECTRL)
fi
if test "$wxUSE_GRID" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_GRID,$wxUSE_GRID)
fi
if test "$wxUSE_TAB_DIALOG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_TAB_DIALOG,$wxUSE_TAB_DIALOG)
fi
if test "$wxUSE_NOTEBOOK" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_NOTEBOOK,$wxUSE_NOTEBOOK)
fi
dnl ----------------------------------------------------------------
dnl Register non-GUI class options for makefiles and setup.h
dnl ----------------------------------------------------------------
@ -1262,14 +1136,6 @@ if test "$wxUSE_TIMEDATE" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_TIMEDATE,$wxUSE_TIMEDATE)
fi
if test "$wxUSE_FRACTION" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_FRACTION,$wxUSE_FRACTION)
fi
if test "$wxUSE_LOG" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_LOG,$wxUSE_LOG)
fi
if test "$wxUSE_INTL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_INTL,$wxUSE_INTL)
fi
@ -1282,14 +1148,6 @@ if test "$wxUSE_SERIAL" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_SERIAL,$wxUSE_SERIAL)
fi
if test "$wxUSE_FILE" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_FILE,$wxUSE_FILE)
fi
if test "$wxUSE_TEXTFILE" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_TEXTFILE,$wxUSE_TEXTFILE)
fi
dnl ----------------------------------------------------------------
dnl Register Prolog and Resources options for makefiles and setup.h
dnl ----------------------------------------------------------------
@ -1362,25 +1220,14 @@ if test "$wxUSE_CLIPBOARD" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_CLIPBOARD,$wxUSE_CLIPBOARD)
fi
if test "$wxUSE_DND" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_DND,$wxUSE_DND)
fi
if test "$wxUSE_CONSTRAINTS" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_CONSTRAINTS,$wxUSE_CONSTRAINTS)
if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
AC_DEFINE_UNQUOTED(wxUSE_DRAG_AND_DROP,$wxUSE_DRAG_AND_DROP)
fi
dnl ----------------------------------------------------------------
dnl No effect
dnl No effect yet
dnl ----------------------------------------------------------------
METAFILE=NONE
if test "$wxUSE_METAFILE" = 1 ; then
METAFILE="METAFILE"
AC_DEFINE_UNQUOTED(wxUSE_METAFILE,$wxUSE_METAFILE)
fi
AC_SUBST(METAFILE)
HELP=NONE
if test "$wxUSE_HELP" = 1 ; then
HELP="HELP"
@ -1388,25 +1235,6 @@ if test "$wxUSE_HELP" = 1 ; then
fi
AC_SUBST(HELP)
WXGRAPH=NONE
if test "$wxUSE_WXGRAPH" = 1 ; then
WXGRAPH="WXGRAPH"
AC_DEFINE_UNQUOTED(wxUSE_WXGRAPH,$wxUSE_WXGRAPH)
fi
AC_SUBST(WXGRAPH)
WXTREE=NONE
if test "$wxUSE_WXTREE" = 1 ; then
WXTREE="WXTREE"
AC_DEFINE_UNQUOTED(wxUSE_WXTREE,$wxUSE_WXTREE)
fi
AC_SUBST(WXTREE)
GLCANVAS=NONE
if test "$wxUSE_OPENGL" = 1 ; then
GLCANVAS="GLCANVAS"
fi
dnl ----------------------------------------------------------------
dnl select dynamic loader (used by iODBC to load drivers)
dnl ----------------------------------------------------------------
@ -1418,29 +1246,11 @@ dnl ----------------------------------------------------------------
dnl thread support
dnl ----------------------------------------------------------------
wxUSE_THREADS=1
THREADS_LINK=""
UNIX_THREAD="gtk/threadno.cpp"
AC_OVERRIDES(threads,threads,
**--without-threads Force disabling threads,
wxUSE_THREADS)
UNIX_THREAD=""
if test "$wxUSE_THREADS" = "1"; then
case "$os" in
solaris*)
AC_CHECK_LIB(thread, thr_create, [
UNIX_THREAD="gtk/threadsol.cpp"
THREADS_LINK="-lthread"
])
;;
*)
UNIX_THREAD="gtk/threadno.cpp"
dnl For glibc 2 users who have the old libc 5 too
AC_CHECK_LIB(pthread-0.7, pthread_create, [
@ -1460,13 +1270,16 @@ if test "$wxUSE_THREADS" = "1"; then
])
])
if test "$THREADS_LINK" != ""; then
AC_DEFINE(wxUSE_THREADS)
fi
dnl -lposix4 seems to be required on Solaris
AC_CHECK_LIB(posix4, printf, [
THREADS_LINK="$THREADS_LINK -lposix4"
]);;
esac
])
fi
if test "$wxUSE_MOTIF" = "1"; then
@ -1479,77 +1292,11 @@ fi
AC_SUBST(UNIX_THREAD)
AC_SUBST(THREADS_LINK)
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 wxUSE_THREADS if thread support is activated. (GL)
dnl ----------------------------------------------------------------
dnl search for opengl
dnl ----------------------------------------------------------------
OPENGL_INCLUDE=
OPENGL_LIBRARY=
OPENGL_LINK=
if test "$wxUSE_OPENGL" = 1; then
dnl checking OPENGL includes
AC_MSG_CHECKING(for OpenGL includes)
AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,GL/gl.h)
if test "$ac_find_includes" != "" ; then
OPENGL_INCLUDE="-I$ac_find_includes"
AC_MSG_RESULT(found $ac_find_includes)
dnl checking OPENGL libraries
AC_MSG_CHECKING(for OpenGL library)
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,GL)
if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
OPENGL_LIBRARY="$ac_path_to_link"
OPENGL_INCLUDE="$ac_path_to_include"
OPENGL_LINK="-lGL"
AC_MSG_RESULT(found OpenGL at $ac_find_libraries)
else
AC_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
if test "$ac_find_libraries" != "" ; then
AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
OPENGL_LIBRARY="$ac_path_to_link"
OPENGL_INCLUDE="$ac_path_to_include"
OPENGL_LINK="-lMesaGL"
AC_MSG_RESULT(found MESA at $ac_find_libraries)
else
AC_MSG_ERROR(no)
fi
fi
else
AC_MSG_ERROR(no)
fi
fi
dnl ----------------------------------------------------------------
dnl left-over
dnl ----------------------------------------------------------------
wxUSE_GLX=$wxUSE_OPENGL
if test "$wxUSE_OPENGL" != 1; then
OPENGL_LIBRARIES=
OPENGL_INCLUDE=
OPENGL_LINK=
GLCANVAS=NONE
fi
AC_DEFINE_UNQUOTED(wxUSE_GLX,$wxUSE_GLX)
AC_SUBST(OPENGL_INCLUDE)
AC_SUBST(OPENGL_LIBRARY)
AC_SUBST(OPENGL_LINK)
AC_SUBST(GLCANVAS)
dnl ------------------------------------------------------------------------
dnl compiler options for shared libs
dnl ------------------------------------------------------------------------

18
include/wx/confbase.h
View File

@ -18,14 +18,11 @@
#pragma interface "confbase.h"
#endif
// ----------------------------------------------------------------------------
// compile options
// ----------------------------------------------------------------------------
#include "wx/defs.h"
// it won't compile without it anyhow
#ifndef wxUSE_CONFIG
#error "Please define wxUSE_CONFIG or remove config.cpp from your makefile"
#endif // wxUSE_CONFIG
#ifdef wxUSE_CONFIG
#include "wx/string.h"
// ----------------------------------------------------------------------------
// constants
@ -287,7 +284,10 @@ private:
#define sm_classwxConfig sm_classwxFileConfig
#endif
#endif
// wxUSE_CONFIG
#endif // _WX_CONFIG_H_
#endif
// _WX_CONFIG_H_

2
include/wx/date.h
View File

@ -20,7 +20,7 @@
#include "wx/object.h"
#include "wx/string.h"
#if wxUSE_TIMEDATE
#ifdef wxUSE_TIMEDATE
enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};

6
include/wx/docview.h
View File

@ -34,7 +34,9 @@ class WXDLLEXPORT wxPrintInfo;
class WXDLLEXPORT wxCommand;
class WXDLLEXPORT wxCommandProcessor;
class WXDLLEXPORT wxFileHistory;
#ifdef wxUSE_CONFIG
class WXDLLEXPORT wxConfigBase;
#endif
#if wxUSE_IOSTREAMH
// N.B. BC++ doesn't have istream.h, ostream.h
@ -342,8 +344,10 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
virtual wxString GetHistoryFile(int i) const;
virtual void FileHistoryUseMenu(wxMenu *menu);
virtual void FileHistoryRemoveMenu(wxMenu *menu);
#ifdef wxUSE_CONFIG
virtual void FileHistoryLoad(wxConfigBase& config);
virtual void FileHistorySave(wxConfigBase& config);
#endif
virtual void FileHistoryAddFilesToMenu();
virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
protected:
@ -512,8 +516,10 @@ class WXDLLEXPORT wxFileHistory: public wxObject
// Remove menu from the list (MDI child may be closing)
virtual void RemoveMenu(wxMenu *menu);
#ifdef wxUSE_CONFIG
virtual void Load(wxConfigBase& config);
virtual void Save(wxConfigBase& config);
#endif
virtual void AddFilesToMenu();
virtual void AddFilesToMenu(wxMenu* menu); // Single menu

18
include/wx/fileconf.h
View File

@ -18,17 +18,13 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_CONFIG
#include "wx/confbase.h"
#include "wx/textfile.h"
#include "wx/string.h"
// ----------------------------------------------------------------------------
// compile options
// ----------------------------------------------------------------------------
// it won't compile without it anyhow
#ifndef wxUSE_CONFIG
#error "Please define wxUSE_CONFIG or remove fileconf.cpp from your makefile"
#endif // wxUSE_CONFIG
// ----------------------------------------------------------------------------
// wxFileConfig
@ -351,5 +347,9 @@ public:
};
};
#endif //_FILECONF_H
#endif
// wxUSE_CONFIG
#endif
//_FILECONF_H

2
include/wx/generic/statusbr.h
View File

@ -17,6 +17,8 @@
#endif
#include "wx/window.h"
#include "wx/pen.h"
#include "wx/font.h"
WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr;

1
include/wx/generic/treectrl.h
View File

@ -28,6 +28,7 @@ WXDLLEXPORT_DATA(extern const char*) wxTreeCtrlNameStr;
#include "wx/event.h"
#include "wx/scrolwin.h"
#include "wx/textctrl.h"
#include "wx/pen.h"
// -----------------------------------------------------------------------------
// constants

1
include/wx/gtk/bmpbuttn.h
View File

@ -19,6 +19,7 @@
#include "wx/object.h"
#include "wx/list.h"
#include "wx/control.h"
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// classes

6
include/wx/gtk/clipbrd.h
View File

@ -16,6 +16,9 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_CLIPBOARD
#include "wx/object.h"
#include "wx/list.h"
#include "wx/dataobj.h"
@ -99,6 +102,9 @@ public:
void OnExit();
};
#endif
// wxUSE_CLIPBOARD
#endif
// __GTKCLIPBOARDH__

11
include/wx/gtk/combobox.h
View File

@ -17,6 +17,9 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_COMBOBOX
#include "wx/object.h"
#include "wx/control.h"
@ -116,4 +119,10 @@ public:
DECLARE_EVENT_TABLE()
};
#endif // __GTKCOMBOBOXH__
#endif
// wxUSE_COMBOBOX
#endif
// __GTKCOMBOBOXH__

7
include/wx/gtk/dnd.h
View File

@ -16,6 +16,9 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_DRAG_AND_DROP
#include "wx/object.h"
#include "wx/string.h"
#include "wx/dataobj.h"
@ -148,6 +151,10 @@ class wxDropSource: public wxObject
wxCursor m_goaheadCursor;
};
#endif
// wxUSE_DRAG_AND_DROP
#endif
//__GTKDNDH__

1
include/wx/gtk/frame.h
View File

@ -18,6 +18,7 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/icon.h"
//-----------------------------------------------------------------------------
// classes

2
include/wx/gtk/listbox.h
View File

@ -91,7 +91,9 @@ public:
void SetString( int n, const wxString &string );
void SetStringSelection( const wxString &string, bool select = TRUE );
#ifdef wxUSE_DRAG_AND_DROP
void SetDropTarget( wxDropTarget *dropTarget );
#endif
// implementation

1
include/wx/gtk/statbmp.h
View File

@ -18,6 +18,7 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/control.h"
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// classes

1
include/wx/gtk/tbargtk.h
View File

@ -16,6 +16,7 @@
#include "wx/defs.h"
#include "wx/control.h"
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// classes

19
include/wx/gtk/window.h
View File

@ -22,9 +22,7 @@
#include "wx/validate.h"
#include "wx/cursor.h"
#include "wx/font.h"
#include "wx/dc.h"
#include "wx/region.h"
#include "wx/dnd.h"
#include "wx/accel.h"
//-----------------------------------------------------------------------------
@ -40,14 +38,17 @@ extern wxList wxTopLevelWindows;
class wxLayoutConstraints;
class wxSizer;
#if wxUSE_WX_RESOURCES
class wxResourceTable;
class wxItemResource;
#endif
class wxDC;
class wxClientData;
class wxVoidClientData;
class wxWindow;
#ifdef wxUSE_WX_RESOURCES
class wxResourceTable;
class wxItemResource;
#endif
#ifdef wxUSE_DRAG_AND_DROP
class wxDropTarget;
#endif
//-----------------------------------------------------------------------------
// callback definition for inserting a window (internal)
@ -289,8 +290,10 @@ public:
virtual bool PopupMenu( wxMenu *menu, int x, int y );
#ifdef wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const;
#endif
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = TRUE );
@ -332,7 +335,9 @@ public:
int m_retCode;
wxEvtHandler *m_eventHandler;
wxValidator *m_windowValidator;
#ifdef wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget;
#endif
wxWindowID m_windowId;
wxCursor *m_cursor;
wxFont m_font;

1
include/wx/gtk1/bmpbuttn.h
View File

@ -19,6 +19,7 @@
#include "wx/object.h"
#include "wx/list.h"
#include "wx/control.h"
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// classes

6
include/wx/gtk1/clipbrd.h
View File

@ -16,6 +16,9 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_CLIPBOARD
#include "wx/object.h"
#include "wx/list.h"
#include "wx/dataobj.h"
@ -99,6 +102,9 @@ public:
void OnExit();
};
#endif
// wxUSE_CLIPBOARD
#endif
// __GTKCLIPBOARDH__

11
include/wx/gtk1/combobox.h
View File

@ -17,6 +17,9 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_COMBOBOX
#include "wx/object.h"
#include "wx/control.h"
@ -116,4 +119,10 @@ public:
DECLARE_EVENT_TABLE()
};
#endif // __GTKCOMBOBOXH__
#endif
// wxUSE_COMBOBOX
#endif
// __GTKCOMBOBOXH__

7
include/wx/gtk1/dnd.h
View File

@ -16,6 +16,9 @@
#endif
#include "wx/defs.h"
#ifdef wxUSE_DRAG_AND_DROP
#include "wx/object.h"
#include "wx/string.h"
#include "wx/dataobj.h"
@ -148,6 +151,10 @@ class wxDropSource: public wxObject
wxCursor m_goaheadCursor;
};
#endif
// wxUSE_DRAG_AND_DROP
#endif
//__GTKDNDH__

1
include/wx/gtk1/frame.h
View File

@ -18,6 +18,7 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/window.h"
#include "wx/icon.h"
//-----------------------------------------------------------------------------
// classes

2
include/wx/gtk1/listbox.h
View File

@ -91,7 +91,9 @@ public:
void SetString( int n, const wxString &string );
void SetStringSelection( const wxString &string, bool select = TRUE );
#ifdef wxUSE_DRAG_AND_DROP
void SetDropTarget( wxDropTarget *dropTarget );
#endif
// implementation

1
include/wx/gtk1/statbmp.h
View File

@ -18,6 +18,7 @@
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/control.h"
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// classes

1
include/wx/gtk1/tbargtk.h
View File

@ -16,6 +16,7 @@
#include "wx/defs.h"
#include "wx/control.h"
#include "wx/bitmap.h"
//-----------------------------------------------------------------------------
// classes

19
include/wx/gtk1/window.h
View File

@ -22,9 +22,7 @@
#include "wx/validate.h"
#include "wx/cursor.h"
#include "wx/font.h"
#include "wx/dc.h"
#include "wx/region.h"
#include "wx/dnd.h"
#include "wx/accel.h"
//-----------------------------------------------------------------------------
@ -40,14 +38,17 @@ extern wxList wxTopLevelWindows;
class wxLayoutConstraints;
class wxSizer;
#if wxUSE_WX_RESOURCES
class wxResourceTable;
class wxItemResource;
#endif
class wxDC;
class wxClientData;
class wxVoidClientData;
class wxWindow;
#ifdef wxUSE_WX_RESOURCES
class wxResourceTable;
class wxItemResource;
#endif
#ifdef wxUSE_DRAG_AND_DROP
class wxDropTarget;
#endif
//-----------------------------------------------------------------------------
// callback definition for inserting a window (internal)
@ -289,8 +290,10 @@ public:
virtual bool PopupMenu( wxMenu *menu, int x, int y );
#ifdef wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget *GetDropTarget() const;
#endif
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = TRUE );
@ -332,7 +335,9 @@ public:
int m_retCode;
wxEvtHandler *m_eventHandler;
wxValidator *m_windowValidator;
#ifdef wxUSE_DRAG_AND_DROP
wxDropTarget *m_dropTarget;
#endif
wxWindowID m_windowId;
wxCursor *m_cursor;
wxFont m_font;

4
include/wx/image.h
View File

@ -24,7 +24,9 @@
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxImageHandler;
#ifdef wxUSE_LIBPNG
class WXDLLEXPORT wxPNGHandler;
#endif
class WXDLLEXPORT wxBMPHandler;
class WXDLLEXPORT wxImage;
@ -62,6 +64,7 @@ protected:
// wxPNGHandler
//-----------------------------------------------------------------------------
#ifdef wxUSE_LIBPNG
class WXDLLEXPORT wxPNGHandler: public wxImageHandler
{
DECLARE_DYNAMIC_CLASS(wxPNGHandler)
@ -78,6 +81,7 @@ public:
virtual bool LoadFile( wxImage *image, const wxString& name );
virtual bool SaveFile( wxImage *image, const wxString& name );
};
#endif
//-----------------------------------------------------------------------------
// wxBMPHandler

2
include/wx/time.h
View File

@ -14,7 +14,7 @@
#include "wx/object.h"
#if wxUSE_TIMEDATE
#ifdef wxUSE_TIMEDATE
#ifdef __GNUG__
#pragma interface "time.h"

6
include/wx/zstream.h
View File

@ -15,6 +15,10 @@
#pragma interface
#endif
#include "defs.h"
#ifdef wxUSE_ZLIB
#include <wx/stream.h>
class WXDLLEXPORT wxZlibInputStream: public wxFilterInputStream {
@ -48,3 +52,5 @@ class WXDLLEXPORT wxZlibOutputStream: public wxFilterOutputStream {
};
#endif
#endif

7
setup/maketmpl.in
View File

@ -86,10 +86,6 @@ GUI_TK_LINK = @GUI_TK_LINK@
WX_LINK = @WX_LINK@
OPENGL_INCLUDE = @OPENGL_INCLUDE@
OPENGL_LIBRARY = @OPENGL_LIBRARY@
OPENGL_LINK = @OPENGL_LINK@
THREADS_LINK = @THREADS_LINK@
EXTRA_LINK = @EXTRA_LINK@
@ -101,13 +97,10 @@ $(TOOLKIT_DEF) \
$(GUI_TK_INCLUDE) \
-I$(WXBASEDIR)/src/zlib \
-I$(WXBASEDIR)/src/iodbc \
$(OPENGL_INCLUDE) \
$(X_CFLAGS)
WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK) @DL_LIBRARY@
LINK = $(CXX) -o $@

62
setup/setup.hin
View File

@ -63,44 +63,24 @@
/*
* Use gauge item
*/
#undef wxUSE_GAUGE
#define wxUSE_GAUGE 1
/*
* Use combobox item
*/
#undef wxUSE_COMBOBOX
#define wxUSE_COMBOBOX 1
/*
* Use scrollbar item
*/
#undef wxUSE_SCROLLBAR
#define wxUSE_SCROLLBAR 1
/*
* Use notebook item
* Use scrollbar item
*/
#undef wxUSE_NOTEBOOK
/*
* Use listctrl item
*/
#undef wxUSE_LISTCTRL
/*
* Use treectrl item
*/
#undef wxUSE_TREECTRL
/*
* Use grid item
*/
#undef wxUSE_GRID
/*
* Use tab dialog item
*/
#undef wxUSE_TAB_DIALOG
#define wxUSE_RADIOBUTTON 1
//------------------------------------------------------------------------
// non-GUI options
//------------------------------------------------------------------------
/*
* Use fraction class
*/
#undef wxUSE_FRACTION
/*
* Use time and date classes
*/
@ -117,14 +97,6 @@
* Use streams
*/
#undef wxUSE_STREAMS
/*
* Use wxFile
*/
#undef wxUSE_FILE
/*
* Use wxTextFile
*/
#undef wxUSE_TEXTFILE
/*
* Use class serialization
*/
@ -182,11 +154,7 @@
/*
* Use dnd
*/
#undef wxUSE_DND
/*
* Use wxWindows layout constraint system
*/
#undef wxUSE_CONSTRAINTS
#undef wxUSE_DRAG_AND_DROP
//------------------------------------------------------------------------
// architecture options
@ -226,12 +194,6 @@
// the rest
//------------------------------------------------------------------------
/*
* Implement a GLCanvas class as an interface to OpenGL, using the GLX
* extension to the X11 protocol. You can use the (free) Mesa library
* if you don't have a 'real' OpenGL.
*/
#undef wxUSE_GLX
/*
* Use wxWindows help facility (needs wxUSE_IPC 1)
*/
@ -240,18 +202,6 @@
* Use iostream.h rather than iostream
*/
#undef wxUSE_IOSTREAMH
/*
* Use Metafile and Metafile device context
*/
#undef wxUSE_METAFILE
/*
* Use wxGraph
*/
#undef wxUSE_WXGRAPH
/*
* Use wxTree
*/
#undef wxUSE_WXTREE
/*
* Use Apple Ieee-double converter
*/

5
setup/substit.in
View File

@ -38,9 +38,6 @@ s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
s|*WX_LINK*|@WX_LINK@|g
s|*DL_LIBRARY*|@DL_LIBRARY@|g
s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
s|*OPENGL_LINK*|@OPENGL_LINK@|g
s|*TOOLKIT*|@TOOLKIT@|g
s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
s|*THREADS*|@THREADS@|g
@ -49,3 +46,5 @@ s|*EXTRA_LINK*|@EXTRA_LINK@|g
s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
s|*UNIX_THREAD*|@UNIX_THREAD@|g
s|*IODBC_C_SRC*|@IODBC_C_SRC@|g
s|*PNG_C_SRC*|@PNG_C_SRC@|g
s|*Z_C_SRC*|@Z_C_SRC@|g

39
src/Makefile.in
View File

@ -13,7 +13,7 @@ OS=@OS@
# compile a library only
RULE=gslib
# define common stuff
# define source file for odbc
IODBC_C_SRC=\
iodbc/catalog.c \
iodbc/connect.c \
@ -32,6 +32,41 @@ IODBC_C_SRC=\
iodbc/prepare.c \
iodbc/result.c
# define source file for png
PNG_C_SRC=\
png/png.c \
png/pngset.c \
png/pngget.c \
png/pngrutil.c \
png/pngtrans.c \
png/pngwutil.c \
png/pngread.c \
png/pngrio.c \
png/pngwio.c \
png/pngwrite.c \
png/pngrtran.c \
png/pngwtran.c \
png/pngmem.c \
png/pngerror.c \
png/pngpread.c
# define source file for zlib
Z_C_SRC=\
zlib/adler32.c \
zlib/compress.c \
zlib/crc32.c \
zlib/gzio.c \
zlib/uncompr.c \
zlib/deflate.c \
zlib/trees.c \
zlib/zutil.c \
zlib/inflate.c \
zlib/infblock.c \
zlib/inftrees.c \
zlib/infcodes.c \
zlib/infutil.c \
zlib/inffast.c
# include gtk.inc, qt.inc or motif.inc here
include @MAKEINCLUDE@
@ -42,7 +77,7 @@ SHARED_LIBRARY=lib$(LIB_TARGET).so.$(LIB_MAJOR).$(LIB_MINOR)
LIB_CPP_ALL_SRC=$(LIB_CPP_SRC) @UNIX_THREAD@
# @GTK_JOYSTICK@
LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ parser.c
LIB_C_ALL_SRC=$(LIB_C_SRC) @IODBC_C_SRC@ @PNG_C_SRC@ @Z_C_SRC@ parser.c
#define library objects
LIB_OBJ=\

15
src/common/config.cpp
View File

@ -10,10 +10,6 @@
// Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
@ -23,6 +19,10 @@
#include "wx/wxprec.h"
#include <wx/confbase.h>
#ifdef wxUSE_CONFIG
#ifdef __BORLANDC__
#pragma hdrstop
#endif //__BORLANDC__
@ -36,7 +36,6 @@
#include <wx/file.h>
#include <wx/log.h>
#include <wx/textfile.h>
#include <wx/confbase.h>
#include <wx/utils.h>
// we must include (one of) these files for wxConfigBase::Create
@ -409,3 +408,9 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
pc++;
}
}
#endif
// wxUSE_CONFIG

2
src/common/date.cpp
View File

@ -28,7 +28,7 @@
#include "wx/setup.h"
#if wxUSE_TIMEDATE
#ifdef wxUSE_TIMEDATE
#include "wx/date.h"
#include <wx/intl.h>

4
src/common/docview.cpp
View File

@ -1044,6 +1044,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
m_fileHistory->RemoveMenu(menu);
}
#ifdef wxUSE_CONFIG
void wxDocManager::FileHistoryLoad(wxConfigBase& config)
{
if (m_fileHistory)
@ -1055,6 +1056,7 @@ void wxDocManager::FileHistorySave(wxConfigBase& config)
if (m_fileHistory)
m_fileHistory->Save(config);
}
#endif
void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)
{
@ -1820,6 +1822,7 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
m_fileMenus.DeleteObject(menu);
}
#ifdef wxUSE_CONFIG
void wxFileHistory::Load(wxConfigBase& config)
{
m_fileHistoryN = 0;
@ -1846,6 +1849,7 @@ void wxFileHistory::Save(wxConfigBase& config)
config.Write(buf, wxString(m_fileHistory[i]));
}
}
#endif
void wxFileHistory::AddFilesToMenu()
{

13
src/common/fileconf.cpp
View File

@ -14,15 +14,15 @@
#pragma implementation "fileconf.h"
#endif
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/wxprec.h"
#include "wx/fileconf.h"
#ifdef wxUSE_CONFIG
#ifdef __BORLANDC__
#pragma hdrstop
#endif //__BORLANDC__
@ -38,7 +38,6 @@
#include "wx/log.h"
#include "wx/textfile.h"
#include "wx/config.h"
#include "wx/fileconf.h"
#include "wx/utils.h" // for wxGetHomeDir
@ -1380,3 +1379,7 @@ wxString FilterOut(const wxString& str)
return strResult;
}
#endif
// wxUSE_CONFIG

10
src/common/image.cpp
View File

@ -22,7 +22,9 @@
#include "wx/bitmap.h"
#include "wx/debug.h"
#include "wx/log.h"
#ifdef wxUSE_LIBPNG
#include "../png/png.h"
#endif
#include "wx/filefn.h"
//-----------------------------------------------------------------------------
@ -392,7 +394,9 @@ wxImageHandler *wxImage::FindHandler( long bitmapType )
void wxImage::InitStandardHandlers()
{
AddHandler( new wxBMPHandler );
#ifdef wxUSE_LIBPNG
AddHandler( new wxPNGHandler );
#endif
}
void wxImage::CleanUpHandlers()
@ -430,6 +434,8 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), const wxString& WXUNUSE
// wxPNGHandler
//-----------------------------------------------------------------------------
#ifdef wxUSE_LIBPNG
#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
#endif
@ -655,6 +661,10 @@ bool wxPNGHandler::SaveFile( wxImage *image, const wxString& name )
return TRUE;
}
#endif
// wxUSE_LIBPNG
//-----------------------------------------------------------------------------
// wxBMPHandler
//-----------------------------------------------------------------------------

5
src/common/layout.cpp
View File

@ -22,8 +22,6 @@
#include "wx/defs.h"
#if wxUSE_CONSTRAINTS
#ifndef WX_PRECOMP
#include "wx/window.h"
#include "wx/utils.h"
@ -1727,6 +1725,3 @@ wxSpacingSizer::~wxSpacingSizer()
{
}
#endif

2
src/common/time.cpp
View File

@ -27,7 +27,7 @@ seconds since January 1, 1901, GMT.
#include "wx/setup.h"
#if wxUSE_TIMEDATE
#ifdef wxUSE_TIMEDATE
#include "wx/time.h"
#include "wx/date.h"

16
src/common/zstream.cpp
View File

@ -14,10 +14,13 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include <wx/stream.h>
#include <wx/zstream.h>
#include <wx/utils.h>
#include <wx/intl.h>
#include "wx/zstream.h"
#ifdef wxUSE_ZLIB
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "../zlib/zlib.h" // don't change this, Robert
@ -181,3 +184,8 @@ size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
}
return size;
}
#endif
// wxUSE_ZLIB

36
src/gtk.inc
View File

@ -35,8 +35,7 @@ LIB_CPP_SRC=\
common/memory.cpp \
common/module.cpp \
common/object.cpp \
common/db.cpp \
common/dbtable.cpp \
common/odbc.cpp \
common/postscrp.cpp \
common/prntbase.cpp \
common/serbase.cpp \
@ -149,35 +148,4 @@ LIB_CPP_SRC=\
LIB_C_SRC=\
common/extended.c \
\
gtk/win_gtk.c \
\
png/png.c \
png/pngset.c \
png/pngget.c \
png/pngrutil.c \
png/pngtrans.c \
png/pngwutil.c \
png/pngread.c \
png/pngrio.c \
png/pngwio.c \
png/pngwrite.c \
png/pngrtran.c \
png/pngwtran.c \
png/pngmem.c \
png/pngerror.c \
png/pngpread.c \
\
zlib/adler32.c \
zlib/compress.c \
zlib/crc32.c \
zlib/gzio.c \
zlib/uncompr.c \
zlib/deflate.c \
zlib/trees.c \
zlib/zutil.c \
zlib/inflate.c \
zlib/infblock.c \
zlib/inftrees.c \
zlib/infcodes.c \
zlib/infutil.c \
zlib/inffast.c \
gtk/win_gtk.c

7
src/gtk/app.cpp
View File

@ -24,8 +24,9 @@
#endif
#include "wx/module.h"
#include "wx/image.h"
#ifdef wxUSE_THREADS
#include "wx/thread.h"
#endif
#include "unistd.h"
#include "glib.h"
@ -145,9 +146,13 @@ END_EVENT_TABLE()
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
#ifdef wxUSE_THREADS
wxMutexGuiLeave();
#endif
usleep(10000);
#ifdef wxUSE_THREADS
wxMutexGuiEnter();
#endif
return TRUE;
}

7
src/gtk/clipbrd.cpp
View File

@ -13,6 +13,8 @@
#include "wx/clipbrd.h"
#ifdef wxUSE_CLIPBOARD
#include "glib.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@ -547,3 +549,8 @@ void wxClipboardModule::OnExit()
if (wxTheClipboard) delete wxTheClipboard;
wxTheClipboard = (wxClipboard*) NULL;
}
#endif
// wxUSE_CLIPBOARD

8
src/gtk/combobox.cpp
View File

@ -11,7 +11,11 @@
#pragma implementation "combobox.h"
#endif
#include "wx/combobox.h"
#ifdef wxUSE_COMBOBOX
#include <wx/intl.h>
#include "gdk/gdk.h"
@ -538,3 +542,7 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
(window == GTK_COMBO(m_widget)->button->window ) );
}
#endif
// wxUSE_COMBOBOX

9
src/gtk/dnd.cpp
View File

@ -12,6 +12,9 @@
#endif
#include "wx/dnd.h"
#ifdef wxUSE_DRAG_AND_DROP
#include "wx/window.h"
#include "wx/app.h"
#include "wx/gdicmn.h"
@ -986,9 +989,9 @@ shape_create_icon (char **data,
return window;
}
#endif
// NEW_GTK_DND_CODE
#endif
// wxUSE_DRAG_AND_DROP

16
src/gtk/frame.cpp
View File

@ -394,9 +394,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if (m_frameMenuBar)
{
int xx = m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
int ww = m_width - 2*m_miniEdge;
int hh = wxMENU_HEIGHT;
int yy = m_miniEdge + m_miniTitle;
int ww = m_width - 2*m_miniEdge;
int hh = wxMENU_HEIGHT;
m_frameMenuBar->m_x = xx;
m_frameMenuBar->m_y = yy;
m_frameMenuBar->m_width = ww;
@ -409,9 +409,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if (m_frameToolBar)
{
int xx = m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
int yy = m_miniEdge + m_miniTitle;
if (m_frameMenuBar) yy += wxMENU_HEIGHT;
int ww = m_width - 2*m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = m_frameToolBar->m_height;
m_frameToolBar->m_x = xx;
@ -426,9 +426,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if (m_frameStatusBar)
{
int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
m_frameStatusBar->m_x = xx;
m_frameStatusBar->m_y = yy;

4
src/gtk/listbox.cpp
View File

@ -319,9 +319,11 @@ void wxListBox::AppendCommon( const wxString &item )
ConnectWidget( list_item );
#ifdef wxUSE_DRAG_AND_DROP
#ifndef NEW_GTK_DND_CODE
if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
#endif
#endif
}
void wxListBox::Append( const wxString &item )
@ -650,6 +652,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
return -1;
}
#ifdef wxUSE_DRAG_AND_DROP
void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_list != NULL, "invalid listbox" );
@ -680,6 +683,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
}
#endif
}
#endif
GtkWidget *wxListBox::GetConnectWidget()
{

13
src/gtk/window.cpp
View File

@ -21,8 +21,9 @@
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/dcclient.h"
#ifdef wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/intl.h"
@ -1166,7 +1167,9 @@ wxWindow::wxWindow()
m_isShown = FALSE;
m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget*) NULL;
#endif
m_resizing = FALSE;
m_scrollGC = (GdkGC*) NULL;
m_widgetStyle = (GtkStyle*) NULL;
@ -1332,7 +1335,9 @@ wxWindow::~wxWindow()
{
m_hasVMT = FALSE;
#ifdef wxUSE_DRAG_AND_DROP
if (m_dropTarget) delete m_dropTarget;
#endif
if (m_parent) m_parent->RemoveChild( this );
if (m_widget) Show( FALSE );
@ -1451,7 +1456,9 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
m_isShown = FALSE;
m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget *) NULL;
#endif
m_resizing = FALSE;
m_windowValidator = (wxValidator *) NULL;
m_scrollGC = (GdkGC*) NULL;
@ -2488,6 +2495,8 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
return TRUE;
}
#ifdef wxUSE_DRAG_AND_DROP
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_widget != NULL, "invalid window" );
@ -2507,6 +2516,8 @@ wxDropTarget *wxWindow::GetDropTarget() const
return m_dropTarget;
}
#endif
GtkWidget* wxWindow::GetConnectWidget()
{
GtkWidget *connect_widget = m_widget;

7
src/gtk1/app.cpp
View File

@ -24,8 +24,9 @@
#endif
#include "wx/module.h"
#include "wx/image.h"
#ifdef wxUSE_THREADS
#include "wx/thread.h"
#endif
#include "unistd.h"
#include "glib.h"
@ -145,9 +146,13 @@ END_EVENT_TABLE()
gint wxapp_idle_callback( gpointer WXUNUSED(data) )
{
if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
#ifdef wxUSE_THREADS
wxMutexGuiLeave();
#endif
usleep(10000);
#ifdef wxUSE_THREADS
wxMutexGuiEnter();
#endif
return TRUE;
}

7
src/gtk1/clipbrd.cpp
View File

@ -13,6 +13,8 @@
#include "wx/clipbrd.h"
#ifdef wxUSE_CLIPBOARD
#include "glib.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"
@ -547,3 +549,8 @@ void wxClipboardModule::OnExit()
if (wxTheClipboard) delete wxTheClipboard;
wxTheClipboard = (wxClipboard*) NULL;
}
#endif
// wxUSE_CLIPBOARD

8
src/gtk1/combobox.cpp
View File

@ -11,7 +11,11 @@
#pragma implementation "combobox.h"
#endif
#include "wx/combobox.h"
#ifdef wxUSE_COMBOBOX
#include <wx/intl.h>
#include "gdk/gdk.h"
@ -538,3 +542,7 @@ bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
(window == GTK_COMBO(m_widget)->button->window ) );
}
#endif
// wxUSE_COMBOBOX

9
src/gtk1/dnd.cpp
View File

@ -12,6 +12,9 @@
#endif
#include "wx/dnd.h"
#ifdef wxUSE_DRAG_AND_DROP
#include "wx/window.h"
#include "wx/app.h"
#include "wx/gdicmn.h"
@ -986,9 +989,9 @@ shape_create_icon (char **data,
return window;
}
#endif
// NEW_GTK_DND_CODE
#endif
// wxUSE_DRAG_AND_DROP

16
src/gtk1/frame.cpp
View File

@ -394,9 +394,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if (m_frameMenuBar)
{
int xx = m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
int ww = m_width - 2*m_miniEdge;
int hh = wxMENU_HEIGHT;
int yy = m_miniEdge + m_miniTitle;
int ww = m_width - 2*m_miniEdge;
int hh = wxMENU_HEIGHT;
m_frameMenuBar->m_x = xx;
m_frameMenuBar->m_y = yy;
m_frameMenuBar->m_width = ww;
@ -409,9 +409,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if (m_frameToolBar)
{
int xx = m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
int yy = m_miniEdge + m_miniTitle;
if (m_frameMenuBar) yy += wxMENU_HEIGHT;
int ww = m_width - 2*m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = m_frameToolBar->m_height;
m_frameToolBar->m_x = xx;
@ -426,9 +426,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if (m_frameStatusBar)
{
int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
m_frameStatusBar->m_x = xx;
m_frameStatusBar->m_y = yy;

4
src/gtk1/listbox.cpp
View File

@ -319,9 +319,11 @@ void wxListBox::AppendCommon( const wxString &item )
ConnectWidget( list_item );
#ifdef wxUSE_DRAG_AND_DROP
#ifndef NEW_GTK_DND_CODE
if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
#endif
#endif
}
void wxListBox::Append( const wxString &item )
@ -650,6 +652,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
return -1;
}
#ifdef wxUSE_DRAG_AND_DROP
void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_list != NULL, "invalid listbox" );
@ -680,6 +683,7 @@ void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
}
#endif
}
#endif
GtkWidget *wxListBox::GetConnectWidget()
{

13
src/gtk1/window.cpp
View File

@ -21,8 +21,9 @@
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/dcclient.h"
#ifdef wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#include "wx/menu.h"
#include "wx/statusbr.h"
#include "wx/intl.h"
@ -1166,7 +1167,9 @@ wxWindow::wxWindow()
m_isShown = FALSE;
m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget*) NULL;
#endif
m_resizing = FALSE;
m_scrollGC = (GdkGC*) NULL;
m_widgetStyle = (GtkStyle*) NULL;
@ -1332,7 +1335,9 @@ wxWindow::~wxWindow()
{
m_hasVMT = FALSE;
#ifdef wxUSE_DRAG_AND_DROP
if (m_dropTarget) delete m_dropTarget;
#endif
if (m_parent) m_parent->RemoveChild( this );
if (m_widget) Show( FALSE );
@ -1451,7 +1456,9 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
m_isShown = FALSE;
m_isEnabled = TRUE;
#ifdef wxUSE_DRAG_AND_DROP
m_dropTarget = (wxDropTarget *) NULL;
#endif
m_resizing = FALSE;
m_windowValidator = (wxValidator *) NULL;
m_scrollGC = (GdkGC*) NULL;
@ -2488,6 +2495,8 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
return TRUE;
}
#ifdef wxUSE_DRAG_AND_DROP
void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_widget != NULL, "invalid window" );
@ -2507,6 +2516,8 @@ wxDropTarget *wxWindow::GetDropTarget() const
return m_dropTarget;
}
#endif
GtkWidget* wxWindow::GetConnectWidget()
{
GtkWidget *connect_widget = m_widget;