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

tons of fixes for wxGTK/Univ - seems to work, more or less, now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-03 19:38:19 +00:00
parent 67d95e11cf
commit 3379ed3789
56 changed files with 1315 additions and 932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1380
configure vendored
View File

File diff suppressed because it is too large Load Diff

22
configure.in
View File

@ -686,6 +686,7 @@ if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_CONSTRAINTS=no
DEFAULT_wxUSE_IPC=no
DEFAULT_wxUSE_HELP=no
DEFAULT_wxUSE_WXHTML_HELP=no
DEFAULT_wxUSE_WXTREE=no
DEFAULT_wxUSE_METAFILE=no
DEFAULT_wxUSE_MIMETYPE=no
@ -837,6 +838,7 @@ else
DEFAULT_wxUSE_CONSTRAINTS=yes
DEFAULT_wxUSE_IPC=yes
DEFAULT_wxUSE_HELP=yes
DEFAULT_wxUSE_WXHTML_HELP=yes
DEFAULT_wxUSE_WXTREE=yes
DEFAULT_wxUSE_METAFILE=yes
DEFAULT_wxUSE_MIMETYPE=yes
@ -1059,7 +1061,9 @@ dnl "big" GUI options
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(docview, [ --enable-docview use document view architecture], wxUSE_DOC_VIEW_ARCHITECTURE)
WX_ARG_ENABLE(help, [ --enable-help use help (using external browser at present)], wxUSE_HELP)
WX_ARG_ENABLE(help, [ --enable-help use help subsystem], wxUSE_HELP)
WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], wxUSE_HTML)
WX_ARG_ENABLE(htmlhelp, [ --enable-htmlhelp use wxHTML-based help], wxUSE_WXHTML_HELP)
WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS)
WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
@ -1238,7 +1242,6 @@ dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(menus, [ --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes], wxUSE_MENUS)
WX_ARG_ENABLE(miniframe, [ --enable-miniframe use wxMiniFrame class], wxUSE_MINIFRAME)
WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], wxUSE_HTML)
WX_ARG_ENABLE(tooltips, [ --enable-tooltips use wxToolTip class], wxUSE_TOOLTIPS)
WX_ARG_ENABLE(splines, [ --enable-splines use spline drawing code], wxUSE_SPLINES)
WX_ARG_ENABLE(validators, [ --enable-validators use wxValidator and derived classes], wxUSE_VALIDATORS)
@ -2055,7 +2058,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
dnl misc other files depending on the port
PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
if test "$wxUSE_UNIVERSAL" = "yes"; then
PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
dnl put univ files first!
PORT_FILES="\${top_srcdir}/src/univ/files.lst ${PORT_FILES}"
fi
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
RPM_SPEC="wx\$(TOOLKIT).spec"
@ -3859,6 +3863,10 @@ fi
if test "$wxUSE_HELP" = "yes"; then
AC_DEFINE(wxUSE_HELP)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
if test "$wxUSE_WXHTML_HELP" = "yes"; then
AC_DEFINE(wxUSE_WXHTML_HELP)
fi
fi
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
@ -3875,12 +3883,8 @@ if test "$wxUSE_PROLOGIO" = "yes" ; then
fi
if test "$wxUSE_RESOURCES" = "yes" ; then
if test "$wxUSE_PROLOGIO" = "yes" ; then
AC_DEFINE(wxUSE_RESOURCES)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
else
AC_MSG_WARN([wxWindows ressource system requires PrologIO and can't be compiled without it.])
fi
AC_DEFINE(wxUSE_RESOURCES)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
fi
if test "$wxUSE_X_RESOURCES" = "yes"; then

19
distrib/msw/tmake/filelist.txt
View File

@ -96,7 +96,8 @@ prop.cpp G
propform.cpp G
proplist.cpp G
sashwin.cpp G
scrolwin.cpp G R
scrlwing.cpp G
spinctlg.cpp G
splash.cpp G
splitter.cpp G
statline.cpp G U,R,P
@ -152,6 +153,7 @@ fs_inet.cpp C B
fs_zip.cpp C B
fs_mem.cpp C B
ftp.cpp C S,B
gaugecmn.cpp C
gdicmn.cpp C
geometry.cpp C
gifdecod.cpp C
@ -349,12 +351,13 @@ bmpbuttn.cpp V
button.cpp V
checkbox.cpp V
checklst.cpp V
cmdproc.cpp V
colschem.cpp V
control.cpp V
framuniv.cpp V
gauge.cpp V
inphand.cpp V
listbox.cpp V
notebook.cpp V
radiobox.cpp V
radiobut.cpp V
renderer.cpp V
@ -373,7 +376,7 @@ gtk.cpp V
winuniv.cpp V
win32.cpp V
gsockgtk.c R
gsockgtk.c R L
win_gtk.c R L
app.cpp R L
bitmap.cpp R L
@ -382,7 +385,8 @@ brush.cpp R L
button.cpp R
checkbox.cpp R
checklst.cpp R
choice.cpp R
# FIXME: remove 'L' flag from choice!
choice.cpp R L
clipbrd.cpp R L
colour.cpp R L
combobox.cpp R
@ -395,7 +399,7 @@ dcclient.cpp R L
dcmemory.cpp R L
dcscreen.cpp R L
dialog.cpp R L
dnd.cpp R
dnd.cpp R L
font.cpp R L
fontdlg.cpp R
frame.cpp R L
@ -423,11 +427,12 @@ statbmp.cpp R
statbox.cpp R
statline.cpp R
stattext.cpp R
tbargtk.cpp R
# FIXME: remove 'L' here too!
tbargtk.cpp R L
textctrl.cpp R
tglbtn.cpp R
timer.cpp R L
tooltip.cpp R
tooltip.cpp R L
utilsgtk.cpp R L
utilsres.cpp R
wave.cpp R

298
include/wx/chkconf.h
View File

@ -93,6 +93,14 @@
# endif
#endif /* !defined(wxUSE_CHOICE) */
#ifndef wxUSE_CHOICEDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CHOICEDLG must be defined."
# else
# define wxUSE_CHOICEDLG 0
# endif
#endif /* !defined(wxUSE_CHOICEDLG) */
#ifndef wxUSE_CLIPBOARD
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CLIPBOARD must be defined."
@ -117,6 +125,14 @@
# endif
#endif /* !defined(wxUSE_DATAOBJ) */
#ifndef wxUSE_DOC_VIEW_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined."
# else
# define wxUSE_DOC_VIEW_ARCHITECTURE 0
# endif
#endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
#ifndef wxUSE_FILEDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_FILEDLG must be defined."
@ -157,6 +173,14 @@
# endif
#endif /* !defined(wxUSE_GRID) */
#ifndef wxUSE_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_HELP must be defined."
# else
# define wxUSE_HELP 0
# endif
#endif /* !defined(wxUSE_HELP) */
#ifndef wxUSE_IMAGLIST
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_IMAGLIST must be defined."
@ -181,13 +205,29 @@
# endif
#endif /* !defined(wxUSE_LISTCTRL) */
#ifndef wxUSE_MSGDLG
#ifndef wxUSE_LOG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MSGDLG must be defined."
# error "wxUSE_LOG must be defined."
# else
# define wxUSE_MSGDLG 0
# define wxUSE_LOG 0
# endif
#endif /* !defined(wxUSE_MSGDLG) */
#endif /* !defined(wxUSE_LOG) */
#ifndef wxUSE_LOGGUI
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LOGGUI must be defined."
# else
# define wxUSE_LOGGUI 0
# endif
#endif /* !defined(wxUSE_LOGGUI) */
#ifndef wxUSE_LOGWINDOW
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LOGWINDOW must be defined."
# else
# define wxUSE_LOGWINDOW 0
# endif
#endif /* !defined(wxUSE_LOGWINDOW) */
#ifndef wxUSE_MDI_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
@ -213,6 +253,14 @@
# endif
#endif /* !defined(wxUSE_MIMETYPE) */
#ifndef wxUSE_MSGDLG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MSGDLG must be defined."
# else
# define wxUSE_MSGDLG 0
# endif
#endif /* !defined(wxUSE_MSGDLG) */
#ifndef wxUSE_NEW_GRID
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_NEW_GRID must be defined."
@ -237,6 +285,14 @@
# endif
#endif /* !defined(wxUSE_POPUPWIN) */
#ifndef wxUSE_PRINTING_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_PRINTING_ARCHITECTURE must be defined."
# else
# define wxUSE_PRINTING_ARCHITECTURE 0
# endif
#endif /* !defined(wxUSE_PRINTING_ARCHITECTURE) */
#ifndef wxUSE_RADIOBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_RADIOBOX must be defined."
@ -325,6 +381,14 @@
# endif
#endif /* !defined(wxUSE_STATLINE) */
#ifndef wxUSE_STATTEXT
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_STATTEXT must be defined."
# else
# define wxUSE_STATTEXT 0
# endif
#endif /* !defined(wxUSE_STATTEXT) */
#ifndef wxUSE_STATUSBAR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_STATUSBAR must be defined."
@ -381,6 +445,14 @@
# endif
#endif /* !defined(wxUSE_TREECTRL) */
#ifndef wxUSE_WXHTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_WXHTML_HELP must be defined."
# else
# define wxUSE_WXHTML_HELP 0
# endif
#endif /* !defined(wxUSE_WXHTML_HELP) */
/*
check consistency of the settings
*/
@ -407,6 +479,7 @@
wxUSE_STATBMP || \
wxUSE_STATBOX || \
wxUSE_STATLINE || \
wxUSE_STATTEXT || \
wxUSE_STATUSBAR || \
wxUSE_TEXTCTRL || \
wxUSE_TOOLBAR || \
@ -421,6 +494,100 @@
# endif
#endif /* controls */
/* wxUniv-specific dependencies */
#if defined(__WXUNIVERSAL__)
# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
# else
# undef wxUSE_POPUPWIN
# define wxUSE_POPUPWIN 1
# endif
# endif
# if wxUSE_COMBOBOX
# if !wxUSE_LISTBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxComboBox requires wxListBox in wxUniversal"
# else
# undef wxUSE_LISTBOX
# define wxUSE_LISTBOX 1
# endif
# endif
# endif /* wxUSE_COMBOBOX */
# if wxUSE_RADIOBTN
# if !wxUSE_CHECKBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal"
# else
# undef wxUSE_CHECKBOX
# define wxUSE_CHECKBOX 1
# endif
# endif
# endif /* wxUSE_RADIOBTN */
# if wxUSE_TEXTCTRL
# if !wxUSE_CARET
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxTextCtrl requires wxCaret in wxUniversal"
# else
# undef wxUSE_CARET
# define wxUSE_CARET 1
# endif
# endif /* wxUSE_CARET */
# if !wxUSE_SCROLLBAR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxTextCtrl requires wxScrollBar in wxUniversal"
# else
# undef wxUSE_SCROLLBAR
# define wxUSE_SCROLLBAR 1
# endif
# endif /* wxUSE_SCROLLBAR */
# endif /* wxUSE_TEXTCTRL */
#endif /* __WXUNIVERSAL__ */
/* wxGTK-specific dependencies */
#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "MDI requires wxUSE_MENUS in wxGTK"
# else
# undef wxUSE_MENUS
# define wxUSE_MENUS 1
# endif
# endif
#endif /* wxGTK && !wxUniv */
/* generic controls dependencies */
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
/* all common controls are needed by these dialogs */
# if !defined(wxUSE_CHOICE) || \
!defined(wxUSE_TEXTCTRL) || \
!defined(wxUSE_BUTTON) || \
!defined(wxUSE_CHECKBOX) || \
!defined(wxUSE_STATTEXT)
# ifdef wxABORT_ON_CONFIG_ERROR
# error "These common controls are needed by common dialogs"
# else
# undef wxUSE_CHOICE
# define wxUSE_CHOICE 1
# undef wxUSE_TEXTCTRL
# define wxUSE_TEXTCTRL 1
# undef wxUSE_BUTTON
# define wxUSE_BUTTON 1
# undef wxUSE_CHECKBOX
# define wxUSE_CHECKBOX 1
# undef wxUSE_STATTEXT
# define wxUSE_STATTEXT 1
# endif
# endif
# endif
#endif /* !wxMSW || wxUniv */
/* common dependencies */
#if wxUSE_CALENDARCTRL
# if !(wxUSE_SPINBTN && wxUSE_COMBOBOX)
# ifdef wxABORT_ON_CONFIG_ERROR
@ -445,16 +612,42 @@
# endif
#endif /* wxUSE_RADIOBTN */
#if wxUSE_COMBOBOX
# if defined(__WXUNIVERSAL__) && !wxUSE_LISTBOX
#if wxUSE_WXHTML_HELP
# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "Built in help controller can't be compiled"
# else
# undef wxUSE_HELP
# define wxUSE_HELP 1
# undef wxUSE_HTML
# define wxUSE_HTML 1
# undef wxUSE_COMBOBOX
# define wxUSE_COMBOBOX 1
# endif
# endif
#endif /* wxUSE_WXHTML_HELP */
#if wxUSE_PRINTING_ARCHITECTURE
# if !wxUSE_COMBOBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "Print dialog requires wxUSE_COMBOBOX"
# else
# undef wxUSE_COMBOBOX
# define wxUSE_COMBOBOX 1
# endif
# endif
#endif /* wxUSE_PRINTING_ARCHITECTURE */
#if wxUSE_DOC_VIEW_ARCHITECTURE
# if !wxUSE_MENUS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxComboBox requires wxListBox in wxUniversal"
# error "DocView requires wxUSE_MENUS"
# else
# undef wxUSE_LISTBOX
# define wxUSE_LISTBOX 1
# undef wxUSE_MENUS
# define wxUSE_MENUS 1
# endif
# endif
#endif /* wxUSE_COMBOBOX */
#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
#if !wxUSE_FILEDLG
# if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML
@ -467,17 +660,6 @@
# endif
#endif /* wxUSE_FILEDLG */
#if !wxUSE_FONTDLG
# if wxUSE_FONTMAP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxFontDialog must be compiled as well"
# else
# undef wxUSE_FONTDLG
# define wxUSE_FONTDLG 1
# endif
# endif
#endif /* !wxUSE_FONTDLG */
#if !wxUSE_IMAGLIST
# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
@ -499,17 +681,6 @@
# endif
#endif
#if wxUSE_RADIOBTN
# if defined(__WXUNIVERSAL__) && !wxUSE_CHECKBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal"
# else
# undef wxUSE_CHECKBOX
# define wxUSE_CHECKBOX 1
# endif
# endif
#endif /* wxUSE_RADIOBTN */
#if wxUSE_RADIOBOX
# if !wxUSE_RADIOBTN || !wxUSE_STATBOX
# ifdef wxABORT_ON_CONFIG_ERROR
@ -534,32 +705,21 @@
# endif
#endif /* wxUSE_STOPWATCH */
#if wxUSE_TEXTCTRL
# ifdef __WXUNIVERSAL__
# if !wxUSE_CARET
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxTextCtrl requires wxCaret in wxUniversal"
# else
# undef wxUSE_CARET
# define wxUSE_CARET 1
# endif
# endif /* wxUSE_CARET */
# if !wxUSE_SCROLLBAR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxTextCtrl requires wxScrollBar in wxUniversal"
# else
# undef wxUSE_SCROLLBAR
# define wxUSE_SCROLLBAR 1
# endif
# endif /* wxUSE_SCROLLBAR */
# endif /* __WXUNIVERSAL__ */
#endif /* wxUSE_RADIOBTN */
#if wxUSE_LOGWINDOW
# if !wxUSE_TEXTCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LOGWINDOW requires wxUSE_TEXTCTRL"
# else
# undef wxUSE_TEXTCTRL
# define wxUSE_TEXTCTRL 1
# endif
# endif
#endif /* wxUSE_LOGWINDOW */
/* I wonder if we shouldn't just remove all occurrences of
wxUSE_DYNAMIC_CLASSES from the sources? */
#if !defined(wxUSE_DYNAMIC_CLASSES) || !wxUSE_DYNAMIC_CLASSES
# if wxABORT_ON_CONFIG_ERROR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_DYNAMIC_CLASSES must be defined as 1"
# else
# undef wxUSE_DYNAMIC_CLASSES
@ -568,7 +728,7 @@
#endif /* wxUSE_DYNAMIC_CLASSES */
#if wxUSE_MIMETYPE && !wxUSE_TEXTFILE
# if wxABORT_ON_CONFIG_ERROR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE"
# else
# undef wxUSE_TEXTFILE
@ -577,7 +737,7 @@
#endif /* wxUSE_MIMETYPE */
#if wxUSE_TEXTFILE && !wxUSE_FILE
# if wxABORT_ON_CONFIG_ERROR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_TEXTFILE requires wxUSE_FILE"
# else
# undef wxUSE_FILE
@ -586,7 +746,7 @@
#endif /* wxUSE_TEXTFILE */
#if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
# if wxABORT_ON_CONFIG_ERROR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxClipboard requires wxDataObject"
# else
# undef wxUSE_DATAOBJ
@ -594,29 +754,5 @@
# endif
#endif /* wxUSE_CLIPBOARD */
/* wxUniv-specific dependencies */
#if defined(__WXUNIVERSAL__)
# if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
# if wxABORT_ON_CONFIG_ERROR
# error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
# else
# undef wxUSE_POPUPWIN
# define wxUSE_POPUPWIN 1
# endif
# endif
#endif /* wxUSE_POPUPWIN */
/* wxGTK-specific dependencies */
#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS
# if wxABORT_ON_CONFIG_ERROR
# error "MDI requires wxUSE_MENUS in wxGTK"
# else
# undef wxUSE_MENUS
# define wxUSE_MENUS 1
# endif
# endif
#endif /* wxGTK && !wxUniv */
#endif /* wxUSE_GUI */

12
include/wx/generic/grid.h
View File

@ -375,6 +375,8 @@ protected:
friend class wxGridCellEditorDummyFriend;
};
#if wxUSE_TEXTCTRL
// the editor for string/text data
class WXDLLEXPORT wxGridCellTextEditor : public wxGridCellEditor
{
@ -489,6 +491,10 @@ private:
double m_valueOld;
};
#endif // wxUSE_TEXTCTRL
#if wxUSE_CHECKBOX
// the editor for boolean data
class WXDLLEXPORT wxGridCellBoolEditor : public wxGridCellEditor
{
@ -517,6 +523,10 @@ private:
bool m_startValue;
};
#endif // wxUSE_CHECKBOX
#if wxUSE_COMBOBOX
// the editor for string data allowing to choose from the list of strings
class WXDLLEXPORT wxGridCellChoiceEditor : public wxGridCellEditor
{
@ -551,6 +561,8 @@ private:
bool m_allowOthers;
};
#endif // wxUSE_COMBOBOX
// ----------------------------------------------------------------------------
// wxGridCellAttr: this class can be used to alter the cells appearance in
// the grid by changing their colour/font/... from default. An object of this

3
include/wx/generic/gridctrl.h
View File

@ -91,6 +91,8 @@ protected:
};
#if wxUSE_COMBOBOX
class WXDLLEXPORT wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
@ -106,6 +108,7 @@ private:
long int m_startint;
};
#endif // wxUSE_COMBOBOX
class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
{

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

@ -13,7 +13,7 @@
#define _WX_GENERIC_SCROLLWIN_H_
#ifdef __GNUG__
#pragma interface "scrolwin.h"
#pragma interface "genscrolwin.h"
#endif
// ----------------------------------------------------------------------------

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

@ -173,7 +173,7 @@ public:
GdkIC *m_ic;
GdkICAttr *m_icattr;
#endif
/* scrolling stuff */
GtkAdjustment *m_hAdjust,*m_vAdjust;
float m_oldHorizontalPos;
@ -200,7 +200,7 @@ public:
// before the widget has been "realized"
bool m_delayedForegroundColour:1;
bool m_delayedBackgroundColour:1;
// contains GTK's widgets internal information about non-default widget
// font and colours. we create one for each widget that gets any
// non-default attribute set via SetFont() or SetForegroundColour() /
@ -236,4 +236,6 @@ private:
DECLARE_NO_COPY_CLASS(wxWindowGTK);
};
extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);
#endif // __GTKWINDOWH__

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

@ -173,7 +173,7 @@ public:
GdkIC *m_ic;
GdkICAttr *m_icattr;
#endif
/* scrolling stuff */
GtkAdjustment *m_hAdjust,*m_vAdjust;
float m_oldHorizontalPos;
@ -200,7 +200,7 @@ public:
// before the widget has been "realized"
bool m_delayedForegroundColour:1;
bool m_delayedBackgroundColour:1;
// contains GTK's widgets internal information about non-default widget
// font and colours. we create one for each widget that gets any
// non-default attribute set via SetFont() or SetForegroundColour() /
@ -236,4 +236,6 @@ private:
DECLARE_NO_COPY_CLASS(wxWindowGTK);
};
extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);
#endif // __GTKWINDOWH__

23
include/wx/help.h
View File

@ -1,6 +1,8 @@
#ifndef _WX_HELP_H_BASE_
#define _WX_HELP_H_BASE_
#if wxUSE_HELP
#include "wx/helpbase.h"
#ifdef __WXMSW__
@ -10,22 +12,19 @@
#define sm_classwxHelpController sm_classwxWinHelpController
#else // !MSW
/* By default, if wxHTML is compiled in, use the
wxHelpControllerHtml. If not, use the external help controller.
(of course, we shouldn't do it for wxMSW)
*/
#if wxUSE_HTML
# include "wx/generic/helpwxht.h"
# define wxHelpController wxHelpControllerHtml
# define sm_classwxHelpController sm_classwxHelpControllerHtml
#if wxUSE_WXHTML_HELP
#include "wx/generic/helpwxht.h"
#define wxHelpController wxHelpControllerHtml
#define sm_classwxHelpController sm_classwxHelpControllerHtml
#else
# include "wx/generic/helpext.h"
# define wxHelpController wxExtHelpController
# define sm_classwxHelpController sm_classwxExtHelpController
#include "wx/generic/helpext.h"
#define wxHelpController wxExtHelpController
#define sm_classwxHelpController sm_classwxExtHelpController
#endif
#endif // MSW/!MSW
#endif // wxUSE_HELP
#endif
// _WX_HELP_H_BASE_

18
include/wx/helpbase.h
View File

@ -17,13 +17,14 @@
#endif
#include "wx/defs.h"
#if wxUSE_HELP
#include "wx/object.h"
#include "wx/string.h"
#include "wx/gdicmn.h"
#include "wx/frame.h"
#if wxUSE_HELP
// Flags for SetViewer
#define wxHELP_NETSCAPE 1
@ -31,20 +32,20 @@
class WXDLLEXPORT wxHelpControllerBase: public wxObject
{
DECLARE_CLASS(wxHelpControllerBase)
public:
inline wxHelpControllerBase() {}
inline ~wxHelpControllerBase() {};
// Must call this to set the filename and server name.
// server is only required when implementing TCP/IP-based
// help controllers.
virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; }
virtual bool Initialize(const wxString& WXUNUSED(file)) { return FALSE; }
// Set viewer: only relevant to some kinds of controller
virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
// If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = "") = 0;
@ -73,7 +74,7 @@ public:
{
// does nothing by default
}
/// Obtains the latest settings used by the help frame and the help
/// Obtains the latest settings used by the help frame and the help
/// frame.
virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL,
wxPoint *WXUNUSED(pos) = NULL,
@ -81,11 +82,12 @@ public:
{
return (wxFrame*) NULL;// does nothing by default
}
virtual bool Quit(void) = 0;
virtual void OnQuit(void) {};
};
#endif // wxUSE_HELP
#endif
// _WX_HELPBASEH__

6
include/wx/html/helpfrm.h
View File

@ -18,7 +18,7 @@
#include "wx/defs.h"
#if wxUSE_HTML
#if wxUSE_WXHTML_HELP
#include "wx/html/helpdata.h"
#include "wx/window.h"
@ -218,12 +218,12 @@ protected:
#endif
wxHashTable *m_PagesHash;
wxHelpControllerBase* m_helpController;
int m_hfStyle;
DECLARE_EVENT_TABLE()
};
#endif // wxUSE_HTML
#endif // wxUSE_WXHTML_HELP
#endif

4
include/wx/msw/setup0.h
View File

@ -722,6 +722,10 @@
// 0 for no help facility
#define wxUSE_MS_HTML_HELP 0
// 0 for no MS HTML Help
// Use wxHTML-based help controller?
#define wxUSE_WXHTML_HELP 1
#define wxUSE_RESOURCES 1
// 0 for no wxGetResource/wxWriteResource
#define wxUSE_CONSTRAINTS 1

2
include/wx/scrolwin.h
View File

@ -170,7 +170,7 @@ protected:
// wxScrolledWindow: a wxWindow which knows how to scroll
// ----------------------------------------------------------------------------
#ifdef __WXGTK__
#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
#include "wx/gtk/scrolwin.h"
#else // !wxGTK
#include "wx/generic/scrolwin.h"

5
include/wx/univ/renderer.h
View File

@ -32,6 +32,7 @@ class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxCheckListBox;
class WXDLLEXPORT wxListBox;
class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxMenuGeometryInfo;
class WXDLLEXPORT wxScrollBar;
class WXDLLEXPORT wxTextCtrl;
class WXDLLEXPORT wxWindow;
@ -43,10 +44,6 @@ class WXDLLEXPORT wxGauge;
#include "wx/gdicmn.h"
#include "wx/scrolbar.h" // for wxScrollBar::Element
#ifndef WX_PRECOMP
#include "wx/menu.h" // for wxMenuGeometryInfo
#endif // WX_PRECOMP
// ----------------------------------------------------------------------------
// wxRenderer: abstract renderers interface
// ----------------------------------------------------------------------------

6
include/wx/univ/stattext.h
View File

@ -33,7 +33,7 @@ public:
wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString &name = wxStaticTextNameStr)
{
@ -45,7 +45,7 @@ public:
wxWindowID id,
const wxString &label,
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
const wxSize &size = wxDefaultSize,
long style = 0,
const wxString &name = wxStaticTextNameStr);
@ -59,6 +59,8 @@ protected:
// draw the control
virtual void DoDraw(wxControlRenderer *renderer);
DECLARE_ABSTRACT_CLASS(wxStaticText)
};
#endif // _WX_UNIV_STATTEXT_H_

3
samples/configure.in
View File

@ -60,6 +60,7 @@ AC_OUTPUT([
sashtest/Makefile
scroll/Makefile
scrollsub/Makefile
sockets/Makefile
splitter/Makefile
statbar/Makefile
text/Makefile
@ -69,7 +70,7 @@ AC_OUTPUT([
treelay/Makefile
typetest/Makefile
validate/Makefile
sockets/Makefile
widgets/Makefile
wizard/Makefile
html/Makefile
html/about/Makefile

2
samples/minimal/minimal.cpp
View File

@ -156,6 +156,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// set the frame icon
SetIcon(wxICON(mondrian));
#if wxUSE_MENUS
// create a menu bar
wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
@ -172,6 +173,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// ... and attach this menu bar to the frame
SetMenuBar(menuBar);
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only)

1
samples/widgets/button.cpp
View File

@ -26,6 +26,7 @@
// for all others, include the necessary headers
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/log.h"
#include "wx/button.h"

4
samples/widgets/combobox.cpp
View File

@ -24,6 +24,8 @@
#pragma hdrstop
#endif
#if wxUSE_COMBOBOX
// for all others, include the necessary headers
#ifndef WX_PRECOMP
#include "wx/log.h"
@ -492,3 +494,5 @@ void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
CreateCombo();
}
#endif //wxUSE_COMBOBOX

7
setup.h.in
View File

@ -649,9 +649,14 @@
#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
/*
* Use wxWindows help facility (needs wxUSE_IPC 1)
* Use wxWindows help facility
*/
#define wxUSE_HELP 0
/*
* Use built-in HTML-based help controller
*/
#define wxUSE_WXHTML_HELP 0
/*
* Use iostream.h rather than iostream
*/

2
src/common/fontmap.cpp
View File

@ -738,6 +738,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
#endif // wxUSE_CONFIG
// ask the user
#if wxUSE_FONTDLG
if ( interactive )
{
wxString title(m_titleDialog);
@ -797,6 +798,7 @@ bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
}
}
//else: we're in non-interactive mode
#endif // wxUSE_FONTDLG
// now try the default mappings:
wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);

4
src/common/framecmn.cpp
View File

@ -385,6 +385,7 @@ void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
{
#if wxUSE_MENUS
if ( !statbar )
return FALSE;
@ -409,6 +410,9 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
statbar->SetStatusText(helpString);
return !helpString.IsEmpty();
#else // !wxUSE_MENUS
return FALSE;
#endif // wxUSE_MENUS/!wxUSE_MENUS
}
#endif // wxUSE_STATUSBAR

12
src/common/gdicmn.cpp
View File

@ -122,8 +122,16 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
// check that we didn't make the rectangle invalid by accident (you almost
// never want to have negative coords and never want negative size)
wxASSERT_MSG( x >= 0 && y >= 0 && width >= 0 && height >= 0,
_T("wxRect::Inflate() resulted in an invalid rectangle!") );
if ( x < 0 )
x = 0;
if ( y < 0 )
y = 0;
// what else can we do?
if ( width < 0 )
width = 0;
if ( height < 0 )
height = 0;
return *this;
}

4
src/common/helpbase.cpp
View File

@ -24,10 +24,10 @@
#include "wx/defs.h"
#endif
#include "wx/helpbase.h"
#if wxUSE_HELP
#include "wx/helpbase.h"
IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
#endif // wxUSE_HELP

4
src/common/resource.cpp
View File

@ -2648,6 +2648,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
}
}
#if wxUSE_MENUS
wxMenu *wxResourceCreateMenu(wxItemResource *item)
{
wxMenu *menu = new wxMenu;
@ -2708,6 +2710,8 @@ wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
return (wxMenu *) NULL;
}
#endif // wxUSE_MENUS
// Global equivalents (so don't have to refer to default table explicitly)
bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
{

2
src/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
ALL_SOURCES = \
common/init.cpp \

2
src/generic/scrlwing.cpp
View File

@ -57,9 +57,7 @@
#endif
#endif
#ifndef __WXGTK__
IMPLEMENT_CLASS(wxScrolledWindow, wxGenericScrolledWindow)
#endif
// ----------------------------------------------------------------------------
// wxScrollHelperEvtHandler: intercept the events from the window and forward

18
src/generic/spinctlg.cpp
View File

@ -28,9 +28,8 @@
#pragma hdrstop
#endif
#if !wxUSE_SPINBTN
#error "This file can only be compiled if wxSpinButton is available"
#endif // !wxUSE_SPINBTN
#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
defined(__WXUNIVERSAL__)
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
@ -197,8 +196,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
wxControl::DoMoveWindow(x, y, width, height);
// position the subcontrols inside the client area
wxSize sizeBtn = m_btn->GetSize(),
sizeText = m_text->GetSize();
wxSize sizeBtn = m_btn->GetSize();
wxCoord wText = width - sizeBtn.x;
m_text->SetSize(x, y, wText, height);
@ -225,8 +223,13 @@ bool wxSpinCtrl::Show(bool show)
if ( !wxControl::Show(show) )
return FALSE;
m_btn->Show(show);
m_text->Show(show);
// under GTK Show() is called the first time before we are fully
// constructed
if ( m_btn )
{
m_btn->Show(show);
m_text->Show(show);
}
return TRUE;
}
@ -319,3 +322,4 @@ void wxSpinCtrl::SetRange(int min, int max)
m_btn->SetRange(min, max);
}
#endif // !wxPort-with-native-spinctrl

21
src/gtk/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \
generic/accel.cpp \
@ -33,6 +33,8 @@ ALL_SOURCES = \
generic/propform.cpp \
generic/proplist.cpp \
generic/sashwin.cpp \
generic/scrlwing.cpp \
generic/spinctlg.cpp \
generic/splash.cpp \
generic/splitter.cpp \
generic/statusbr.cpp \
@ -85,6 +87,7 @@ ALL_SOURCES = \
common/fs_mem.cpp \
common/fs_zip.cpp \
common/ftp.cpp \
common/gaugecmn.cpp \
common/gdicmn.cpp \
common/geometry.cpp \
common/gifdecod.cpp \
@ -628,6 +631,7 @@ COMMONOBJS = \
fs_mem.o \
fs_zip.o \
ftp.o \
gaugecmn.o \
gdicmn.o \
geometry.o \
gifdecod.o \
@ -743,6 +747,7 @@ COMMONDEPS = \
fs_mem.d \
fs_zip.d \
ftp.d \
gaugecmn.d \
gdicmn.d \
geometry.d \
gifdecod.d \
@ -848,6 +853,8 @@ GENERICOBJS = \
propform.o \
proplist.o \
sashwin.o \
scrlwing.o \
spinctlg.o \
splash.o \
splitter.o \
statusbr.o \
@ -893,6 +900,8 @@ GENERICDEPS = \
propform.d \
proplist.d \
sashwin.d \
scrlwing.d \
spinctlg.d \
splash.d \
splitter.d \
statusbr.d \
@ -1031,6 +1040,7 @@ GUI_LOWLEVEL_OBJS = \
app.o \
bitmap.o \
brush.o \
choice.o \
clipbrd.o \
colour.o \
cursor.o \
@ -1041,15 +1051,19 @@ GUI_LOWLEVEL_OBJS = \
dcmemory.o \
dcscreen.o \
dialog.o \
dnd.o \
font.o \
frame.o \
gdiobj.o \
gsockgtk.o \
icon.o \
main.o \
pen.o \
region.o \
settings.o \
tbargtk.o \
timer.o \
tooltip.o \
utilsgtk.o \
win_gtk.o \
window.o
@ -1058,6 +1072,7 @@ GUI_LOWLEVEL_DEPS = \
app.d \
bitmap.d \
brush.d \
choice.d \
clipbrd.d \
colour.d \
cursor.d \
@ -1068,15 +1083,19 @@ GUI_LOWLEVEL_DEPS = \
dcmemory.d \
dcscreen.d \
dialog.d \
dnd.d \
font.d \
frame.d \
gdiobj.d \
gsockgtk.d \
icon.d \
main.d \
pen.d \
region.d \
settings.d \
tbargtk.d \
timer.d \
tooltip.d \
utilsgtk.d \
win_gtk.d \
window.d

6
src/gtk/region.cpp
View File

@ -766,10 +766,8 @@ wxCoord wxRegionIterator::GetH() const
wxRect wxRegionIterator::GetRect() const
{
wxRect r;
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (node)
r = *((wxRect*)node->Data());
if( HaveRects() )
r = ((wxRIRefData*)m_refData)->m_rects[m_current];
return r;
}

1
src/gtk/scrolwin.cpp
View File

@ -775,3 +775,4 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
event.Skip();
}
}

3
src/gtk/textctrl.cpp
View File

@ -80,7 +80,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
// "focus_in_event"
//-----------------------------------------------------------------------------
wxWindow *FindFocusedChild(wxWindow *win);
extern wxWindow *g_focusWindow;
extern bool g_blockEventsOnDrag;
// extern bool g_isIdle;
@ -152,7 +151,7 @@ static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(e
g_sendActivateEvent = 0;
#endif
wxWindow *winFocus = FindFocusedChild(win);
wxWindow *winFocus = wxFindFocusedChild(win);
if ( winFocus )
win = winFocus;

20
src/gtk/window.cpp
View File

@ -333,25 +333,25 @@ extern bool g_isIdle;
// returns the child of win which currently has focus or NULL if not found
//
// Note: can't be static, needed by textctrl.cpp.
wxWindow *FindFocusedChild(wxWindowGTK *win)
wxWindow *wxFindFocusedChild(wxWindowGTK *win)
{
wxWindowGTK *winFocus = wxWindowGTK::FindFocus();
wxWindow *winFocus = wxWindowGTK::FindFocus();
if ( !winFocus )
return (wxWindowGTK *)NULL;
return (wxWindow *)NULL;
if ( winFocus == win )
return win;
return (wxWindow *)win;
for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
node;
node = node->GetNext() )
{
wxWindowGTK *child = FindFocusedChild(node->GetData());
wxWindow *child = wxFindFocusedChild(node->GetData());
if ( child )
return child;
}
return (wxWindowGTK *)NULL;
return (wxWindow *)NULL;
}
static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
@ -1749,7 +1749,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
// g_sendActivateEvent to -1
g_sendActivateEvent = 0;
wxWindowGTK *winFocus = FindFocusedChild(win);
wxWindowGTK *winFocus = wxFindFocusedChild(win);
if ( winFocus )
win = winFocus;
@ -3067,7 +3067,7 @@ bool wxWindowGTK::Show( bool show )
return TRUE;
}
static void wxWindowNotifyEnable(wxWindow* win, bool enable)
static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
{
win->OnParentEnable(enable);
@ -3084,7 +3084,7 @@ static void wxWindowNotifyEnable(wxWindow* win, bool enable)
}
}
bool wxWindow::Enable( bool enable )
bool wxWindowGTK::Enable( bool enable )
{
wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
@ -3394,7 +3394,7 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
wxWindowBase::DoSetToolTip(tip);
if (m_tooltip)
m_tooltip->Apply( this );
m_tooltip->Apply( (wxWindow *)this );
}
void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

21
src/gtk1/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
ALL_SOURCES = \
generic/accel.cpp \
@ -33,6 +33,8 @@ ALL_SOURCES = \
generic/propform.cpp \
generic/proplist.cpp \
generic/sashwin.cpp \
generic/scrlwing.cpp \
generic/spinctlg.cpp \
generic/splash.cpp \
generic/splitter.cpp \
generic/statusbr.cpp \
@ -85,6 +87,7 @@ ALL_SOURCES = \
common/fs_mem.cpp \
common/fs_zip.cpp \
common/ftp.cpp \
common/gaugecmn.cpp \
common/gdicmn.cpp \
common/geometry.cpp \
common/gifdecod.cpp \
@ -628,6 +631,7 @@ COMMONOBJS = \
fs_mem.o \
fs_zip.o \
ftp.o \
gaugecmn.o \
gdicmn.o \
geometry.o \
gifdecod.o \
@ -743,6 +747,7 @@ COMMONDEPS = \
fs_mem.d \
fs_zip.d \
ftp.d \
gaugecmn.d \
gdicmn.d \
geometry.d \
gifdecod.d \
@ -848,6 +853,8 @@ GENERICOBJS = \
propform.o \
proplist.o \
sashwin.o \
scrlwing.o \
spinctlg.o \
splash.o \
splitter.o \
statusbr.o \
@ -893,6 +900,8 @@ GENERICDEPS = \
propform.d \
proplist.d \
sashwin.d \
scrlwing.d \
spinctlg.d \
splash.d \
splitter.d \
statusbr.d \
@ -1031,6 +1040,7 @@ GUI_LOWLEVEL_OBJS = \
app.o \
bitmap.o \
brush.o \
choice.o \
clipbrd.o \
colour.o \
cursor.o \
@ -1041,15 +1051,19 @@ GUI_LOWLEVEL_OBJS = \
dcmemory.o \
dcscreen.o \
dialog.o \
dnd.o \
font.o \
frame.o \
gdiobj.o \
gsockgtk.o \
icon.o \
main.o \
pen.o \
region.o \
settings.o \
tbargtk.o \
timer.o \
tooltip.o \
utilsgtk.o \
win_gtk.o \
window.o
@ -1058,6 +1072,7 @@ GUI_LOWLEVEL_DEPS = \
app.d \
bitmap.d \
brush.d \
choice.d \
clipbrd.d \
colour.d \
cursor.d \
@ -1068,15 +1083,19 @@ GUI_LOWLEVEL_DEPS = \
dcmemory.d \
dcscreen.d \
dialog.d \
dnd.d \
font.d \
frame.d \
gdiobj.d \
gsockgtk.d \
icon.d \
main.d \
pen.d \
region.d \
settings.d \
tbargtk.d \
timer.d \
tooltip.d \
utilsgtk.d \
win_gtk.d \
window.d

6
src/gtk1/region.cpp
View File

@ -766,10 +766,8 @@ wxCoord wxRegionIterator::GetH() const
wxRect wxRegionIterator::GetRect() const
{
wxRect r;
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (node)
r = *((wxRect*)node->Data());
if( HaveRects() )
r = ((wxRIRefData*)m_refData)->m_rects[m_current];
return r;
}

1
src/gtk1/scrolwin.cpp
View File

@ -775,3 +775,4 @@ void wxScrolledWindow::OnChar(wxKeyEvent& event)
event.Skip();
}
}

3
src/gtk1/textctrl.cpp
View File

@ -80,7 +80,6 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
// "focus_in_event"
//-----------------------------------------------------------------------------
wxWindow *FindFocusedChild(wxWindow *win);
extern wxWindow *g_focusWindow;
extern bool g_blockEventsOnDrag;
// extern bool g_isIdle;
@ -152,7 +151,7 @@ static gint gtk_text_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(e
g_sendActivateEvent = 0;
#endif
wxWindow *winFocus = FindFocusedChild(win);
wxWindow *winFocus = wxFindFocusedChild(win);
if ( winFocus )
win = winFocus;

20
src/gtk1/window.cpp
View File

@ -333,25 +333,25 @@ extern bool g_isIdle;
// returns the child of win which currently has focus or NULL if not found
//
// Note: can't be static, needed by textctrl.cpp.
wxWindow *FindFocusedChild(wxWindowGTK *win)
wxWindow *wxFindFocusedChild(wxWindowGTK *win)
{
wxWindowGTK *winFocus = wxWindowGTK::FindFocus();
wxWindow *winFocus = wxWindowGTK::FindFocus();
if ( !winFocus )
return (wxWindowGTK *)NULL;
return (wxWindow *)NULL;
if ( winFocus == win )
return win;
return (wxWindow *)win;
for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
node;
node = node->GetNext() )
{
wxWindowGTK *child = FindFocusedChild(node->GetData());
wxWindow *child = wxFindFocusedChild(node->GetData());
if ( child )
return child;
}
return (wxWindowGTK *)NULL;
return (wxWindow *)NULL;
}
static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
@ -1749,7 +1749,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
// g_sendActivateEvent to -1
g_sendActivateEvent = 0;
wxWindowGTK *winFocus = FindFocusedChild(win);
wxWindowGTK *winFocus = wxFindFocusedChild(win);
if ( winFocus )
win = winFocus;
@ -3067,7 +3067,7 @@ bool wxWindowGTK::Show( bool show )
return TRUE;
}
static void wxWindowNotifyEnable(wxWindow* win, bool enable)
static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
{
win->OnParentEnable(enable);
@ -3084,7 +3084,7 @@ static void wxWindowNotifyEnable(wxWindow* win, bool enable)
}
}
bool wxWindow::Enable( bool enable )
bool wxWindowGTK::Enable( bool enable )
{
wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
@ -3394,7 +3394,7 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
wxWindowBase::DoSetToolTip(tip);
if (m_tooltip)
m_tooltip->Apply( this );
m_tooltip->Apply( (wxWindow *)this );
}
void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )

5
src/html/helpctrl.cpp
View File

@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#if wxUSE_WXHTML_HELP
#ifndef WX_PRECOMP
#include "wx/app.h"
@ -248,4 +248,5 @@ bool wxHtmlHelpController::Quit()
return TRUE;
}
#endif
#endif // wxUSE_WXHTML_HELP

59
src/html/helpfrm.cpp
View File

@ -21,7 +21,7 @@
#pragma hdrstop
#endif
#if wxUSE_HTML && wxUSE_STREAMS
#if wxUSE_WXHTML_HELP
#ifndef WXPRECOMP
#include "wx/intl.h"
@ -238,7 +238,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
// moreover, if no contents, index or searchpage is needed, m_Splitter and
// m_NavigPan will be NULL too (with m_HtmlWin directly connected to the frame)
bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
const wxString& WXUNUSED(title), int style)
{
m_hfStyle = style;
@ -301,7 +301,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
if (style & wxHF_BOOKMARKS)
{
{
wxLayoutConstraints *b1 = new wxLayoutConstraints;
wxBitmapButton *bmpbt = new wxBitmapButton(dummy, wxID_HTML_BOOKMARKSREMOVE, wxBITMAP(wbkdel), wxDefaultPosition, wxSize(20,20));
@ -502,18 +502,18 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
if (m_Cfg.navig_on)
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
else
{
{
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
m_Splitter->Unsplit();
}
if (m_Cfg.navig_on)
{
if (m_Cfg.navig_on)
{
m_NavigPan->Show(TRUE);
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
}
else
{
{
m_NavigPan->Show(FALSE);
m_Splitter->Initialize(m_HtmlWin);
}
@ -713,7 +713,7 @@ bool wxHtmlHelpFrame::KeywordSearch(const wxString& keyword)
if (curi % 32 == 0 && progress.Update(curi) == FALSE)
break;
if (status.Search())
{
{
foundstr.Printf(_("Found %i matches"), ++foundcnt);
progress.Update(status.GetCurIndex(), foundstr);
m_SearchList->Append(status.GetName(), status.GetContentsItem());
@ -760,7 +760,7 @@ void wxHtmlHelpFrame::CreateContents()
// We set the icon later: when we find an item with level=n, we know
// that the last item with level=n-1 was folder with subitems, so we
// set its icon accordingly
bool imaged[MAX_ROOTS];
bool imaged[MAX_ROOTS];
m_ContentsBox->DeleteAllItems();
// Don't show (Help) root if there's only one boook
@ -799,7 +799,7 @@ void wxHtmlHelpFrame::CreateContents()
else
{
roots[1] = m_ContentsBox->AppendItem(roots[0],
it->m_Name, IMG_Book, -1,
it->m_Name, IMG_Book, -1,
new wxHtmlHelpTreeItemData(i));
m_ContentsBox->SetItemBold(roots[1], TRUE);
}
@ -807,12 +807,12 @@ void wxHtmlHelpFrame::CreateContents()
}
}
// ...and their contents:
else
else
{
roots[it->m_Level + 1] = m_ContentsBox->AppendItem(
roots[it->m_Level], it->m_Name, IMG_Page,
roots[it->m_Level], it->m_Name, IMG_Page,
-1, new wxHtmlHelpTreeItemData(i));
imaged[it->m_Level + 1] = FALSE;
imaged[it->m_Level + 1] = FALSE;
}
m_PagesHash->Put(it->GetFullPath(),
@ -821,7 +821,7 @@ void wxHtmlHelpFrame::CreateContents()
// Set the icon for the node one level up in the hiearachy,
// unless already done (see comment above imaged[] declaration)
if (!imaged[it->m_Level])
{
{
int image = IMG_Folder;
if (m_hfStyle & wxHF_ICONS_BOOK)
image = IMG_Book;
@ -909,17 +909,17 @@ void wxHtmlHelpFrame::ReadCustomization(wxConfigBase *cfg, const wxString& path)
cnt = cfg->Read(wxT("hcBookmarksCnt"), 0L);
if (cnt != 0)
{
{
m_BookmarksNames.Clear();
m_BookmarksPages.Clear();
if (m_Bookmarks)
{
{
m_Bookmarks->Clear();
m_Bookmarks->Append(_("(bookmarks)"));
}
for (i = 0; i < cnt; i++)
{
{
val.Printf(wxT("hcBookmark_%i"), i);
s = cfg->Read(val);
m_BookmarksNames.Add(s);
@ -967,7 +967,7 @@ void wxHtmlHelpFrame::WriteCustomization(wxConfigBase *cfg, const wxString& path
cfg->Write(wxT("hcBookmarksCnt"), (long)cnt);
for (i = 0; i < cnt; i++)
{
{
val.Printf(wxT("hcBookmark_%i"), i);
cfg->Write(val, m_BookmarksNames[i]);
val.Printf(wxT("hcBookmark_%i_url"), i);
@ -1270,13 +1270,13 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
if (! (m_Splitter && m_NavigPan))
return ;
if (m_Splitter->IsSplit())
{
{
m_Cfg.sashpos = m_Splitter->GetSashPosition();
m_Splitter->Unsplit(m_NavigPan);
m_Cfg.navig_on = FALSE;
}
else
{
else
{
m_NavigPan->Show(TRUE);
m_HtmlWin->Show(TRUE);
m_Splitter->SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
@ -1297,9 +1297,9 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
item = m_HtmlWin->GetOpenedPageTitle();
url = m_HtmlWin->GetOpenedPage();
if (item == wxEmptyString)
item = url.AfterLast(wxT('/'));
item = url.AfterLast(wxT('/'));
if (m_BookmarksPages.Index(url) == wxNOT_FOUND)
{
{
m_Bookmarks->Append(item);
m_BookmarksNames.Add(item);
m_BookmarksPages.Add(url);
@ -1315,7 +1315,7 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
item = m_Bookmarks->GetStringSelection();
pos = m_BookmarksNames.Index(item);
if (pos != wxNOT_FOUND)
{
{
m_BookmarksNames.Remove(pos);
m_BookmarksPages.Remove(pos);
m_Bookmarks->Delete(m_Bookmarks->GetSelection());
@ -1410,7 +1410,7 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
wxBusyCursor bcur;
const wxChar *cstr = sr.c_str();
wxChar mybuff[512];
wxChar *ptr;
wxChar *ptr;
bool first = TRUE;
m_IndexList->Clear();
@ -1426,11 +1426,11 @@ void wxHtmlHelpFrame::OnIndexFind(wxCommandEvent& event)
if (*ptr >= _T('A') && *ptr <= _T('Z'))
*ptr -= (wxChar)(_T('A') - _T('a'));
if (wxStrstr(mybuff, cstr) != NULL)
{
{
m_IndexList->Append(index[i].m_Name, (char*)(index + i));
displ++;
if (first)
{
{
if (index[i].m_Page[0] != 0)
m_HtmlWin->LoadPage(index[i].GetFullPath());
NotifyPageChanged();
@ -1461,7 +1461,7 @@ void wxHtmlHelpFrame::OnIndexAll(wxCommandEvent& WXUNUSED(event))
{
m_IndexList->Append(index[i].m_Name, (char*)(index + i));
if (first)
{
{
if (index[i].m_Page[0] != 0)
m_HtmlWin->LoadPage(index[i].GetFullPath());
NotifyPageChanged();
@ -1538,4 +1538,5 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
END_EVENT_TABLE()
#endif
#endif // wxUSE_WXHTML_HELP

14
src/motif/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
ALL_SOURCES = \
generic/busyinfo.cpp \
@ -33,7 +33,8 @@ ALL_SOURCES = \
generic/propform.cpp \
generic/proplist.cpp \
generic/sashwin.cpp \
generic/scrolwin.cpp \
generic/scrlwing.cpp \
generic/spinctlg.cpp \
generic/splash.cpp \
generic/splitter.cpp \
generic/statline.cpp \
@ -87,6 +88,7 @@ ALL_SOURCES = \
common/fs_mem.cpp \
common/fs_zip.cpp \
common/ftp.cpp \
common/gaugecmn.cpp \
common/gdicmn.cpp \
common/geometry.cpp \
common/gifdecod.cpp \
@ -623,6 +625,7 @@ COMMONOBJS = \
fs_mem.o \
fs_zip.o \
ftp.o \
gaugecmn.o \
gdicmn.o \
geometry.o \
gifdecod.o \
@ -738,6 +741,7 @@ COMMONDEPS = \
fs_mem.d \
fs_zip.d \
ftp.d \
gaugecmn.d \
gdicmn.d \
geometry.d \
gifdecod.d \
@ -843,7 +847,8 @@ GENERICOBJS = \
propform.o \
proplist.o \
sashwin.o \
scrolwin.o \
scrlwing.o \
spinctlg.o \
splash.o \
splitter.o \
statline.o \
@ -890,7 +895,8 @@ GENERICDEPS = \
propform.d \
proplist.d \
sashwin.d \
scrolwin.d \
scrlwing.d \
spinctlg.d \
splash.d \
splitter.d \
statline.d \

14
src/msw/files.lst
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
ALL_SOURCES = \
generic/busyinfo.cpp \
@ -18,7 +18,8 @@ ALL_SOURCES = \
generic/propform.cpp \
generic/proplist.cpp \
generic/sashwin.cpp \
generic/scrolwin.cpp \
generic/scrlwing.cpp \
generic/spinctlg.cpp \
generic/splash.cpp \
generic/splitter.cpp \
generic/statusbr.cpp \
@ -70,6 +71,7 @@ ALL_SOURCES = \
common/fs_mem.cpp \
common/fs_zip.cpp \
common/ftp.cpp \
common/gaugecmn.cpp \
common/gdicmn.cpp \
common/geometry.cpp \
common/gifdecod.cpp \
@ -677,6 +679,7 @@ COMMONOBJS = \
fs_mem.o \
fs_zip.o \
ftp.o \
gaugecmn.o \
gdicmn.o \
geometry.o \
gifdecod.o \
@ -792,6 +795,7 @@ COMMONDEPS = \
fs_mem.d \
fs_zip.d \
ftp.d \
gaugecmn.d \
gdicmn.d \
geometry.d \
gifdecod.d \
@ -882,7 +886,8 @@ GENERICOBJS = \
propform.o \
proplist.o \
sashwin.o \
scrolwin.o \
scrlwing.o \
spinctlg.o \
splash.o \
splitter.o \
statusbr.o \
@ -912,7 +917,8 @@ GENERICDEPS = \
propform.d \
proplist.d \
sashwin.d \
scrolwin.d \
scrlwing.d \
spinctlg.d \
splash.d \
splitter.d \
statusbr.d \

12
src/msw/makefile.b32
View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
#
@ -88,7 +88,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
$(MSWDIR)\propform.obj \
$(MSWDIR)\proplist.obj \
$(MSWDIR)\sashwin.obj \
$(MSWDIR)\scrolwin.obj \
$(MSWDIR)\scrlwing.obj \
$(MSWDIR)\spinctlg.obj \
$(MSWDIR)\splash.obj \
$(MSWDIR)\splitter.obj \
$(MSWDIR)\statusbr.obj \
@ -154,6 +155,7 @@ COMMONOBJS = \
$(MSWDIR)\fs_mem.obj \
$(MSWDIR)\fs_zip.obj \
$(MSWDIR)\ftp.obj \
$(MSWDIR)\gaugecmn.obj \
$(MSWDIR)\gdicmn.obj \
$(MSWDIR)\geometry.obj \
$(MSWDIR)\gifdecod.obj \
@ -693,6 +695,8 @@ $(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
$(MSWDIR)\ftp.obj: $(COMMDIR)\ftp.$(SRCSUFF)
$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
@ -877,7 +881,9 @@ $(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)

12
src/msw/makefile.bcc
View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
#
@ -88,7 +88,8 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
$(MSWDIR)\propform.obj \
$(MSWDIR)\proplist.obj \
$(MSWDIR)\sashwin.obj \
$(MSWDIR)\scrolwin.obj \
$(MSWDIR)\scrlwing.obj \
$(MSWDIR)\spinctlg.obj \
$(MSWDIR)\splash.obj \
$(MSWDIR)\splitter.obj \
$(MSWDIR)\statusbr.obj \
@ -140,6 +141,7 @@ COMMONOBJS = \
$(MSWDIR)\fs_inet.obj \
$(MSWDIR)\fs_mem.obj \
$(MSWDIR)\fs_zip.obj \
$(MSWDIR)\gaugecmn.obj \
$(MSWDIR)\gdicmn.obj \
$(MSWDIR)\geometry.obj \
$(MSWDIR)\gifdecod.obj \
@ -559,6 +561,8 @@ $(MSWDIR)\fs_mem.obj: $(COMMDIR)\fs_mem.$(SRCSUFF)
$(MSWDIR)\fs_zip.obj: $(COMMDIR)\fs_zip.$(SRCSUFF)
$(MSWDIR)\gaugecmn.obj: $(COMMDIR)\gaugecmn.$(SRCSUFF)
$(MSWDIR)\gdicmn.obj: $(COMMDIR)\gdicmn.$(SRCSUFF)
$(MSWDIR)\geometry.obj: $(COMMDIR)\geometry.$(SRCSUFF)
@ -723,7 +727,9 @@ $(MSWDIR)\proplist.obj: $(GENDIR)\proplist.$(SRCSUFF)
$(MSWDIR)\sashwin.obj: $(GENDIR)\sashwin.$(SRCSUFF)
$(MSWDIR)\scrolwin.obj: $(GENDIR)\scrolwin.$(SRCSUFF)
$(MSWDIR)\scrlwing.obj: $(GENDIR)\scrlwing.$(SRCSUFF)
$(MSWDIR)\spinctlg.obj: $(GENDIR)\spinctlg.$(SRCSUFF)
$(MSWDIR)\splash.obj: $(GENDIR)\splash.$(SRCSUFF)

18
src/msw/makefile.dos
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
#
@ -71,7 +71,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
$(GENDIR)\propform.obj \
$(GENDIR)\proplist.obj \
$(GENDIR)\sashwin.obj \
$(GENDIR)\scrolwin.obj \
$(GENDIR)\scrlwing.obj \
$(GENDIR)\spinctlg.obj \
$(GENDIR)\splash.obj \
$(GENDIR)\splitter.obj \
$(GENDIR)\statusbr.obj \
@ -124,6 +125,7 @@ COMMONOBJS1 = \
$(COMMDIR)\fs_inet.obj \
$(COMMDIR)\fs_mem.obj \
$(COMMDIR)\fs_zip.obj \
$(COMMDIR)\gaugecmn.obj \
$(COMMDIR)\gdicmn.obj \
$(COMMDIR)\geometry.obj \
$(COMMDIR)\gifdecod.obj \
@ -941,6 +943,11 @@ $(COMMDIR)/fs_zip.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/gaugecmn.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/gdicmn.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
@ -1336,7 +1343,12 @@ $(GENDIR)/sashwin.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(GENDIR)/scrolwin.obj: $*.$(SRCSUFF)
$(GENDIR)/scrlwing.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(GENDIR)/spinctlg.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<

6
src/msw/makefile.g95
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
#
@ -84,7 +84,8 @@ GENERICOBJS = \
$(GENDIR)/propform.$(OBJSUFF) \
$(GENDIR)/proplist.$(OBJSUFF) \
$(GENDIR)/sashwin.$(OBJSUFF) \
$(GENDIR)/scrolwin.$(OBJSUFF) \
$(GENDIR)/scrlwing.$(OBJSUFF) \
$(GENDIR)/spinctlg.$(OBJSUFF) \
$(GENDIR)/splash.$(OBJSUFF) \
$(GENDIR)/splitter.$(OBJSUFF) \
$(GENDIR)/statusbr.$(OBJSUFF) \
@ -139,6 +140,7 @@ COMMONOBJS = \
$(COMMDIR)/fs_mem.$(OBJSUFF) \
$(COMMDIR)/fs_zip.$(OBJSUFF) \
$(COMMDIR)/ftp.$(OBJSUFF) \
$(COMMDIR)/gaugecmn.$(OBJSUFF) \
$(COMMDIR)/gdicmn.$(OBJSUFF) \
$(COMMDIR)/geometry.$(OBJSUFF) \
$(COMMDIR)/gifdecod.$(OBJSUFF) \

6
src/msw/makefile.sc
View File

@ -1,6 +1,6 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
# Symantec C++ makefile for the msw objects
@ -42,7 +42,8 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
$(GENDIR)\propform.obj \
$(GENDIR)\proplist.obj \
$(GENDIR)\sashwin.obj \
$(GENDIR)\scrolwin.obj \
$(GENDIR)\scrlwing.obj \
$(GENDIR)\spinctlg.obj \
$(GENDIR)\splash.obj \
$(GENDIR)\splitter.obj \
$(GENDIR)\statusbr.obj \
@ -97,6 +98,7 @@ COMMONOBJS = \
$(COMMDIR)\fs_mem.obj \
$(COMMDIR)\fs_zip.obj \
$(COMMDIR)\ftp.obj \
$(COMMDIR)\gaugecmn.obj \
$(COMMDIR)\gdicmn.obj \
$(COMMDIR)\geometry.obj \
$(COMMDIR)\gifdecod.obj \

6
src/msw/makefile.vc
View File

@ -1,4 +1,4 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@ -102,7 +102,8 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
..\generic\$D\propform.obj \
..\generic\$D\proplist.obj \
..\generic\$D\sashwin.obj \
..\generic\$D\scrolwin.obj \
..\generic\$D\scrlwing.obj \
..\generic\$D\spinctlg.obj \
..\generic\$D\splash.obj \
..\generic\$D\splitter.obj \
..\generic\$D\statusbr.obj \
@ -180,6 +181,7 @@ COMMONOBJS = \
..\common\$D\fs_mem.obj \
..\common\$D\fs_zip.obj \
..\common\$D\ftp.obj \
..\common\$D\gaugecmn.obj \
..\common\$D\gdicmn.obj \
..\common\$D\geometry.obj \
..\common\$D\gifdecod.obj \

14
src/msw/makefile.wat
View File

@ -1,6 +1,6 @@
#!/binb/wmake.exe
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
#
@ -58,7 +58,8 @@ GENERICOBJS= busyinfo.obj &
propform.obj &
proplist.obj &
sashwin.obj &
scrolwin.obj &
scrlwing.obj &
spinctlg.obj &
splash.obj &
splitter.obj &
statusbr.obj &
@ -136,6 +137,7 @@ COMMONOBJS = &
fs_mem.obj &
fs_zip.obj &
ftp.obj &
gaugecmn.obj &
gdicmn.obj &
geometry.obj &
gifdecod.obj &
@ -808,6 +810,9 @@ fs_zip.obj: $(COMMDIR)\fs_zip.cpp
ftp.obj: $(COMMDIR)\ftp.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gaugecmn.obj: $(COMMDIR)\gaugecmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gdicmn.obj: $(COMMDIR)\gdicmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -1092,7 +1097,10 @@ proplist.obj: $(GENDIR)\proplist.cpp
sashwin.obj: $(GENDIR)\sashwin.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
scrolwin.obj: $(GENDIR)\scrolwin.cpp
scrlwing.obj: $(GENDIR)\scrlwing.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
spinctlg.obj: $(GENDIR)\spinctlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
splash.obj: $(GENDIR)\splash.cpp

8
src/univ/files.lst
View File

@ -1,17 +1,18 @@
# This file was automatically generated by tmake at 20:23, 2001/07/02
# This file was automatically generated by tmake at 21:37, 2001/07/03
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
UNIVOBJS = \
bmpbuttn.o \
button.o \
checkbox.o \
checklst.o \
cmdproc.o \
colschem.o \
control.o \
framuniv.o \
gauge.o \
gtk.o \
inphand.o \
listbox.o \
notebook.o \
radiobox.o \
radiobut.o \
renderer.o \
@ -34,13 +35,14 @@ UNIVDEPS = \
button.d \
checkbox.d \
checklst.d \
cmdproc.d \
colschem.d \
control.d \
framuniv.d \
gauge.d \
gtk.d \
inphand.d \
listbox.d \
notebook.d \
radiobox.d \
radiobut.d \
renderer.d \

10
src/univ/framuniv.cpp
View File

@ -68,19 +68,22 @@ wxFrame::wxFrame(wxWindow *parent,
}
// ----------------------------------------------------------------------------
// geometry
// menu support
// ----------------------------------------------------------------------------
void wxFrame::OnSize(wxSizeEvent& event)
{
#if wxUSE_MENUS
PositionMenuBar();
#endif // wxUSE_WAVE
event.Skip();
}
#if wxUSE_MENUS
void wxFrame::PositionMenuBar()
{
#if wxUSE_MENUS
if ( m_frameMenuBar )
{
// the menubar is positioned above the client size, hence the negative
@ -88,9 +91,10 @@ void wxFrame::PositionMenuBar()
m_frameMenuBar->SetSize(0, -m_frameMenuBar->GetSize().y,
GetClientSize().x, -1);
}
#endif // wxUSE_MENUS
}
#endif // wxUSE_MENUS
wxPoint wxFrame::GetClientAreaOrigin() const
{
wxPoint pt = wxFrameNative::GetClientAreaOrigin();

2
src/univ/stattext.cpp
View File

@ -42,6 +42,8 @@
// implementation
// ============================================================================
IMPLEMENT_ABSTRACT_CLASS(wxStaticText, wxControl)
// ----------------------------------------------------------------------------
// creation
// ----------------------------------------------------------------------------

6
src/univ/themes/gtk.cpp
View File

@ -1454,11 +1454,13 @@ void wxGTKRenderer::DrawRadioButton(wxDC& dc,
// text control
// ----------------------------------------------------------------------------
static const int TEXT_BORDER = 2;
wxRect wxGTKRenderer::GetTextTotalArea(const wxTextCtrl *text,
const wxRect& rect)
{
wxRect rectTotal = rect;
rectTotal.Inflate(2);
rectTotal.Inflate(TEXT_BORDER);
return rectTotal;
}
@ -1467,7 +1469,7 @@ wxRect wxGTKRenderer::GetTextClientArea(const wxTextCtrl *text,
wxCoord *extraSpaceBeyond)
{
wxRect rectText = rect;
rectText.Inflate(-2);
rectText.Inflate(-TEXT_BORDER);
if ( text->WrapLines() )
{

67
src/univ/themes/win32.cpp
View File

@ -1801,14 +1801,6 @@ void wxWin32Renderer::DoDrawLabel(wxDC& dc,
{
if ( focusOffset.x || focusOffset.y )
{
// before calling Inflate(), ensure that we will have a valid rect
// afterwards
if ( rectLabel.x < focusOffset.x )
rectLabel.x = focusOffset.x;
if ( rectLabel.y < focusOffset.y )
rectLabel.y = focusOffset.y;
rectLabel.Inflate(focusOffset.x, focusOffset.y);
}
@ -2419,6 +2411,8 @@ void wxWin32Renderer::DrawSliderTicks(wxDC& dc,
// menu and menubar
// ----------------------------------------------------------------------------
#if wxUSE_MENUS
// wxWin32MenuGeometryInfo: the wxMenuGeometryInfo used by wxWin32Renderer
class WXDLLEXPORT wxWin32MenuGeometryInfo : public wxMenuGeometryInfo
{
@ -2447,6 +2441,8 @@ private:
GetMenuGeometry(wxWindow *, const wxMenu&) const;
};
#endif // wxUSE_WAVE
// FIXME: all constants are hardcoded but shouldn't be
static const wxCoord MENU_LEFT_MARGIN = 9;
static const wxCoord MENU_RIGHT_MARGIN = 18;
@ -2466,6 +2462,10 @@ static const wxCoord MENU_SEPARATOR_HEIGHT = 3;
// the size of the standard checkmark bitmap
static const wxCoord MENU_CHECK_SIZE = 9;
// we can't implement these methods without wxMenuGeometryInfo implementation
// which we don't have if !wxUSE_MENUS
#if wxUSE_MENUS
void wxWin32Renderer::DrawMenuBarItem(wxDC& dc,
const wxRect& rectOrig,
const wxString& label,
@ -2677,6 +2677,47 @@ wxMenuGeometryInfo *wxWin32Renderer::GetMenuGeometry(wxWindow *win,
return gi;
}
#else // !wxUSE_MENUS
void wxWin32Renderer::DrawMenuBarItem(wxDC& WXUNUSED(dc),
const wxRect& WXUNUSED(rectOrig),
const wxString& WXUNUSED(label),
int WXUNUSED(flags),
int WXUNUSED(indexAccel))
{
}
void wxWin32Renderer::DrawMenuItem(wxDC& WXUNUSED(dc),
wxCoord WXUNUSED(y),
const wxMenuGeometryInfo& WXUNUSED(gi),
const wxString& WXUNUSED(label),
const wxString& WXUNUSED(accel),
const wxBitmap& WXUNUSED(bitmap),
int WXUNUSED(flags),
int WXUNUSED(indexAccel))
{
}
void wxWin32Renderer::DrawMenuSeparator(wxDC& WXUNUSED(dc),
wxCoord WXUNUSED(y),
const wxMenuGeometryInfo& WXUNUSED(gi))
{
}
wxSize wxWin32Renderer::GetMenuBarItemSize(const wxSize& size) const
{
return size;
}
wxMenuGeometryInfo *
wxWin32Renderer::GetMenuGeometry(wxWindow *WXUNUSED(win),
const wxMenu& WXUNUSED(menu)) const
{
return NULL;
}
#endif // wxUSE_MENUS/!wxUSE_MENUS
// ----------------------------------------------------------------------------
// combobox
// ----------------------------------------------------------------------------
@ -2880,11 +2921,6 @@ wxRect wxWin32Renderer::GetTextTotalArea(const wxTextCtrl *text,
wxRect rectTotal = rect;
wxCoord widthBorder = GetTextBorderWidth();
if ( rectTotal.x < widthBorder )
rectTotal.x = widthBorder;
if ( rectTotal.y < widthBorder )
rectTotal.y = widthBorder;
rectTotal.Inflate(widthBorder);
// this is what Windows does
@ -2904,11 +2940,6 @@ wxRect wxWin32Renderer::GetTextClientArea(const wxTextCtrl *text,
rectText.height--;
wxCoord widthBorder = GetTextBorderWidth();
if ( rectText.width < 2*widthBorder )
rectText.width = 2*widthBorder;
if ( rectText.height < 2*widthBorder )
rectText.height = 2*widthBorder;
rectText.Inflate(-widthBorder);
if ( extraSpaceBeyond )

9
src/univ/winuniv.cpp
View File

@ -482,6 +482,15 @@ wxPoint wxWindow::GetClientAreaOrigin() const
void wxWindow::DoGetClientSize(int *width, int *height) const
{
// if it is a native window, we assume it handles the scrollbars itself
// too - and if it doesn't, there is not much we can do
if ( !m_renderer )
{
wxWindowNative::DoGetClientSize(width, height);
return;
}
int w, h;
wxWindowNative::DoGetClientSize(&w, &h);