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

Changes for next snapshot.

Browse Source 
Added new thumb track event for thumb release.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-22 18:02:20 +00:00
parent 475f6e7ae8
commit 88413fec06
18 changed files with 545 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Makefile.in
View File

@@ -1,5 +1,5 @@
#
# This file was automatically generated by tmake at 14:31, 2000/01/19
# This file was automatically generated by tmake at 14:41, 2000/01/22
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
#
@@ -860,7 +860,7 @@ GTK_COMMONOBJS = \
longlong.o \
memory.o \
menucmn.o \
mimecmn.o \
mimetype.o \
module.o \
mstream.o \
object.o \
@@ -958,7 +958,7 @@ GTK_COMMONDEPS = \
longlong.d \
memory.d \
menucmn.d \
mimecmn.d \
mimetype.d \
module.d \
mstream.d \
object.d \
@@ -1258,7 +1258,7 @@ MOTIF_COMMONOBJS = \
longlong.o \
memory.o \
menucmn.o \
mimecmn.o \
mimetype.o \
module.o \
mstream.o \
object.o \
@@ -1356,7 +1356,7 @@ MOTIF_COMMONDEPS = \
longlong.d \
memory.d \
menucmn.d \
mimecmn.d \
mimetype.d \
module.d \
mstream.d \
object.d \
@@ -1612,7 +1612,7 @@ MSW_COMMONOBJS = \
longlong.o \
memory.o \
menucmn.o \
mimecmn.o \
mimetype.o \
module.o \
mstream.o \
object.o \
@@ -1711,7 +1711,7 @@ MSW_COMMONDEPS = \
longlong.d \
memory.d \
menucmn.d \
mimecmn.d \
mimetype.d \
module.d \
mstream.d \
object.d \
@@ -1805,7 +1805,6 @@ MSW_GUIOBJS = \
menu.o \
menuitem.o \
metafile.o \
mimetype.o \
minifram.o \
msgdlg.o \
nativdlg.o \
@@ -1898,7 +1897,6 @@ MSW_GUIDEPS = \
menu.d \
menuitem.d \
metafile.d \
mimetype.d \
minifram.d \
msgdlg.d \
nativdlg.d \
@@ -2068,7 +2066,7 @@ PM_COMMONOBJS = \
longlong.o \
memory.o \
menucmn.o \
mimecmn.o \
mimetype.o \
module.o \
mstream.o \
object.o \
@@ -2167,7 +2165,7 @@ PM_COMMONDEPS = \
longlong.d \
memory.d \
menucmn.d \
mimecmn.d \
mimetype.d \
module.d \
mstream.d \
object.d \
@@ -2380,7 +2378,7 @@ BASE_OBJS = \
list.o \
log.o \
longlong.o \
mimecmn.o \
mimetype.o \
module.o \
object.o \
process.o \
@@ -2419,7 +2417,7 @@ BASE_DEPS = \
list.d \
log.d \
longlong.d \
mimecmn.d \
mimetype.d \
module.d \
object.d \
process.d \
@@ -2488,7 +2486,6 @@ UNIX_OBJS = \
fontenum.o \
fontutil.o \
gsocket.o \
mimetype.o \
threadpsx.o \
utilsunx.o
@@ -2498,7 +2495,6 @@ UNIX_DEPS = \
fontenum.d \
fontutil.d \
gsocket.d \
mimetype.d \
threadpsx.d \
utilsunx.d
@@ -2934,6 +2930,7 @@ DEMOS_DIST:
mkdir $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
@@ -3031,6 +3028,16 @@ SAMPLES_DIST:
cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
mkdir $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
mkdir $(DISTDIR)/samples/font
cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font

599
configure vendored
View File

File diff suppressed because it is too large Load Diff

4
configure.in
View File

@@ -409,7 +409,7 @@ dnl WX_INTERFACE_AGE = 0
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=1
WX_RELEASE_NUMBER=12
WX_RELEASE_NUMBER=13
WX_INTERFACE_AGE=0
WX_BINARY_AGE=0
@@ -3316,11 +3316,13 @@ AC_OUTPUT([
samples/docvwmdi/Makefile
samples/dnd/Makefile
samples/drawing/Makefile
samples/exec/Makefile
samples/font/Makefile
samples/grid/Makefile
samples/help/Makefile
samples/image/Makefile
samples/internat/Makefile
samples/ipc/Makefile
samples/layout/Makefile
samples/listctrl/Makefile
samples/mdi/Makefile

35
demos/poem/makefile.unx Normal file
View File

@@ -0,0 +1,35 @@
#
# File: Makefile for samples
# Author: Robert Roebling
# Created: 1999
# Updated:
# Copyright: (c) 1998 Robert Roebling
#
# This makefile requires a Unix version of wxWindows
# to be installed on your system. This is most often
# done typing "make install" when using the complete
# sources of wxWindows or by installing the two
# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
# under Linux.
#
CC = gcc
PROGRAM = wxpoem
OBJECTS = $(PROGRAM).o
# implementation
.SUFFIXES: .o .cpp
.cpp.o :
$(CC) -c `wx-config --cflags` -o $@ $<
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
clean:
rm -f *.o $(PROGRAM)

11
distrib/msw/tmake/unx.t
View File

@@ -909,6 +909,7 @@ DEMOS_DIST:
mkdir $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/Makefile.in $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/makefile.unx $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/*.cpp $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/*.xpm $(DISTDIR)/demos/poem
cp $(DEMODIR)/poem/*.dat $(DISTDIR)/demos/poem
@@ -1006,6 +1007,16 @@ SAMPLES_DIST:
cp $(SAMPDIR)/dynamic/*.cpp $(DISTDIR)/samples/dynamic
cp $(SAMPDIR)/dynamic/*.xpm $(DISTDIR)/samples/dynamic
mkdir $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/Makefile.in $(DISTDIR)/samples/exec
cp $(SAMPDIR)/exec/*.cpp $(DISTDIR)/samples/exec
mkdir $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/Makefile.in $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.xpm $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.h $(DISTDIR)/samples/ipc
cp $(SAMPDIR)/ipc/*.cpp $(DISTDIR)/samples/ipc
mkdir $(DISTDIR)/samples/font
cp $(SAMPDIR)/font/Makefile.in $(DISTDIR)/samples/font
cp $(SAMPDIR)/font/makefile.unx $(DISTDIR)/samples/font

35
docs/gtk/changes.txt
View File

@@ -1,4 +1,39 @@
24th January '2000: wxWindows 2.1.13 released
Fixed crashes with GTK Pixmap theme.
Fixed endianness problems in image code.
Minor fixes for sockets related to GUI reentrance and others.
Many enhancements to wxHTML, more tags supported, better support
for non-English texts etc.
Corrected code handling mono-bitmaps and their conversion to
wxImage etc.
Fixed a few minor problems in wxListCtrl.
The MIME-type code in now reads KDE and GNOME mime-type bindings
including icon information. This is used in the file dialog.
Small fix for problems with code that didn't changed the size of a
window, but not its client size.
Fixed problem with shared contexts in OpenGl canvas.
Fixed keyboard handling in wxCheckListBox.
Corrected the completely unfunctional TIFF code.
Various minor corrections to wxWizard, wxCalendarCtrl and other
complex controls.
Revamped code for TCP based connections between programs.
Updates to the ODBC classes (George Tasker).
6th January '2000: wxWindows 2.1.12 released
Who has a BigEndian computer (e.g. Sparc or PowerPC) that runs a 15

4
docs/gtk/readme.txt
View File

@@ -1,5 +1,5 @@
Welcome to wxWindows/Gtk 2.1.12
Welcome to wxWindows/Gtk 2.1.13
you have downloaded version 2.1 of the GTK+ 1.2 port of
the wxWindows GUI library. Although this is not yet the
@@ -47,7 +47,7 @@ VERSION OF GTK, WXGTK, WHAT DISTRIBUTION YOU USE AND WHAT ERROR
WAS REPORTED. I know this has no effect, but I tried...
The library produced by the install process will be called
libwx_gtk.a (static) and libwx_gtk-2.1.so.12.0.0 (shared) so
libwx_gtk.a (static) and libwx_gtk-2.1.so.13.0.0 (shared) so
that once a binary incompatible version of wxWindows/Gtk comes
out we'll augment the library version number to avoid linking
problems.

15
docs/latex/wx/category.tex
View File

@@ -289,6 +289,7 @@ wxWindows provides its own classes for socket based networking.
\twocolitem{\helpref{wxHTTP}{wxhttp}}{HTTP protocol class}
\twocolitem{\helpref{wxFTP}{wxftp}}{FTP protocol class}
\twocolitem{\helpref{wxSocketEvent}{wxsocketevent}}{A socket event}
\twocolitem{\helpref{wxIPV4address}{wxipv4address}}{Represents in Internet adress}
\end{twocollist}
@@ -427,7 +428,7 @@ capabilities of the various platforms.
\twocolitem{\helpref{wxMutexLocker}{wxmutexlocker}}{Mutex locker utility class}
\twocolitem{\helpref{wxCriticalSection}{wxcriticalsection}}{Critical section class}
\twocolitem{\helpref{wxCriticalSectionLocker}{wxcriticalsectionlocker}}{ritical section locker utility class}
\twocolitem{\helpref{wxConditiion}{wxcondition}}{Condition class}
\twocolitem{\helpref{wxCondition}{wxcondition}}{Condition class}
\end{twocollist}
{\large {\bf HTML classes}}
@@ -446,6 +447,17 @@ class include a help system based on the HTML widget.
\twocolitem{\helpref{wxHtmlWinTagHandler}{wxhtmlwintaghandler}}{HTML tag handler, pluginable into wxHtmlWinParser}
\end{twocollist}
{\large {\bf Virtual file system classes}}
wxWindows provides a set of classes that implement an extensible virtual file system,
used internally by the HTML classes.
\begin{twocollist}\itemsep=0pt
\twocolitem{\helpref{wxFSFile}{wxfsfile}}{Represents a file in the virtual file system}
\twocolitem{\helpref{wxFileSystem}{wxfilesystem}}{Main interface for the virtual file system}
\twocolitem{\helpref{wxFileSystemHandler}{wxfilesystemhandler}}{Class used to announce file system type}
\end{twocollist}
{\large {\bf Miscellaneous}}
\begin{twocollist}\itemsep=0pt
@@ -456,6 +468,7 @@ class include a help system based on the HTML widget.
\twocolitem{\helpref{wxProcess}{wxprocess}}{Process class}
\twocolitem{\helpref{wxTimer}{wxtimer}}{Timer class}
\twocolitem{\helpref{wxStopWatch}{wxstopwatch}}{Stop watch class}
\twocolitem{\helpref{wxMimeTypesManager}{wxmimetypesmanager}}{MIME-types manager class}
\twocolitem{\helpref{wxSystemSettings}{wxsystemsettings}}{System settings class}
\twocolitem{\helpref{wxAcceleratorTable}{wxacceleratortable}}{Accelerator table}
\twocolitem{\helpref{wxAutomationObject}{wxautomationobject}}{OLE automation class}

2
docs/latex/wx/manual.tex
View File

@@ -31,7 +31,7 @@
}}
\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
Robin Dunn, et al}
\date{January 6th 2000}
\date{January 24th 2000}
}
\makeindex
\begin{document}

3
include/wx/stream.h
View File

@@ -149,7 +149,7 @@ public:
// A stream for measuring streamed output
// ---------------------------------------------------------------------------
class wxCountingOutputStream: public wxOutputStream
class WXDLLEXPORT wxCountingOutputStream: public wxOutputStream
{
public:
wxCountingOutputStream();
@@ -165,7 +165,6 @@ protected:
size_t m_currentPos;
};
// ---------------------------------------------------------------------------
// "Filter" streams
// ---------------------------------------------------------------------------

4
include/wx/version.h
View File

@@ -15,8 +15,8 @@
/* Bump-up with each new version */
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 1
#define wxRELEASE_NUMBER 12
#define wxVERSION_STRING "wxWindows 2.1.12"
#define wxRELEASE_NUMBER 13
#define wxVERSION_STRING "wxWindows 2.1.13"
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
#define wxBETA_NUMBER 0
#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)

21
samples/exec/Makefile.in Normal file
View File

@@ -0,0 +1,21 @@
#
# File: Makefile.in
# Author: Julian Smart
# Created: 1998
# Updated:
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
# Makefile for checklst example (UNIX).
top_srcdir = @top_srcdir@
top_builddir = ../..
program_dir = samples/exec
PROGRAM=exec
OBJECTS=$(PROGRAM).o
include ../../src/makeprog.env

11
src/generic/panelg.cpp
View File

@@ -199,9 +199,14 @@ void wxPanel::SetFocus()
// notebook page change nor after frame activation under MSW (it calls
// SetFocus too)
//
// If you still want to have old behaviour for wxGTK, edit the
// following line
#if 0 // def __WXGTK__
// RR: yes, when I the tab key to navigate in a panel with some controls and
// a notebook and the focus jumps to the notebook (typically coming from
// a button at the top) the notebook should focus the first child in the
// current notebook page, not the last one which would otherwise get the
// focus if you used the tab key to navigate from the current notebook
// page to button at the bottom. See every page in the controls sample.
#ifdef __WXGTK__
m_winLastFocused = (wxWindow *)NULL;
#endif // 0

11
src/gtk/scrolbar.cpp
View File

@@ -104,10 +104,19 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
{
if (g_isIdle) wxapp_install_idle_handler();
wxASSERT( win->m_isScrolling );
win->m_isScrolling = FALSE;
// g_blockEventsOnScroll = FALSE;
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
wxEventType command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)ceil(win->m_adjust->value);
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
wxScrollEvent event( command, value, dir );
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE;
}

25
src/gtk/window.cpp
View File

@@ -1649,7 +1649,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
// "button_release_event" from scrollbar
//-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event),
wxWindow *win)
{
@@ -1661,9 +1661,32 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
//
// if (gdk_event->window != widget->slider) return FALSE;
wxASSERT( win->m_isScrolling );
g_blockEventsOnScroll = FALSE;
win->m_isScrolling = FALSE;
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
int value = -1;
int dir = -1;
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
{
value = (int)(win->m_hAdjust->value+0.5);
dir = wxHORIZONTAL;
}
if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
{
value = (int)(win->m_vAdjust->value+0.5);
dir = wxVERTICAL;
}
wxScrollWinEvent event( command, value, dir );
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE;
}

11
src/gtk1/scrolbar.cpp
View File

@@ -104,10 +104,19 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
{
if (g_isIdle) wxapp_install_idle_handler();
wxASSERT( win->m_isScrolling );
win->m_isScrolling = FALSE;
// g_blockEventsOnScroll = FALSE;
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
wxEventType command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)ceil(win->m_adjust->value);
int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
wxScrollEvent event( command, value, dir );
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE;
}

25
src/gtk1/window.cpp
View File

@@ -1649,7 +1649,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
// "button_release_event" from scrollbar
//-----------------------------------------------------------------------------
static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event),
wxWindow *win)
{
@@ -1661,9 +1661,32 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
//
// if (gdk_event->window != widget->slider) return FALSE;
wxASSERT( win->m_isScrolling );
g_blockEventsOnScroll = FALSE;
win->m_isScrolling = FALSE;
wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
int value = -1;
int dir = -1;
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
{
value = (int)(win->m_hAdjust->value+0.5);
dir = wxHORIZONTAL;
}
if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
{
value = (int)(win->m_vAdjust->value+0.5);
dir = wxVERTICAL;
}
wxScrollWinEvent event( command, value, dir );
event.SetScrolling( FALSE );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
return FALSE;
}

4
wxGTK.spec
View File

@@ -1,6 +1,6 @@
# Note that this is NOT a relocatable package
%define pref /usr
%define ver 2.1.12
%define ver 2.1.13
%define rel 0
Summary: The GTK+ 1.2 port of the wxWindows library
@@ -9,7 +9,7 @@ Version: %{ver}
Release: %{rel}
Copyright: wxWindows Licence
Group: X11/Libraries
Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.12.tgz
Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.13.tgz
URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
BuildRoot: /tmp/wxgtk_root