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

Compile fix for dynarray,

Browse Source 
Use wxStreams in dialoged,
  Small typo in wxApp::OnIdle()
  Distrib things,
  wxPython makefile corrections (libpy.c and libptr.c missing)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-05 20:38:51 +00:00
parent 48e74ff549
commit e70f5e1301
16 changed files with 45 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
distrib/gtk/Setup
View File

@@ -37,7 +37,7 @@ TARGETDIR=$(BINLIBDEST)/wxPython
wxc wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \ wxc wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \ mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
frames.cpp stattool.cpp windows3.cpp image.cpp misc2.cpp \ frames.cpp stattool.cpp windows3.cpp image.cpp misc2.cpp \
utils.cpp printfw.cpp \ utils.cpp printfw.cpp libpy.c libptr.c \
## comment out the next line to disable wxGLCanvas ## comment out the next line to disable wxGLCanvas
##_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \ ##_glcanvas.cpp glcanvas.cpp -DWITH_GLCANVAS -lGL -lGLU \
-I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \ -I. $(WX_CONFIG_CFLAGS) -I/usr/local/lib/glib/include \

2
distrib/gtk/copy_src
View File

@@ -811,4 +811,4 @@ cp README.txt ~/wxgtk_dist/wxGTK/utils/wxPython
cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src cp Setup ~/wxgtk_dist/wxGTK/utils/wxPython/src
cd ~/wxgtk_dist cd ~/wxgtk_dist
tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b8b.tgz tar ch wxGTK | gzip -f9 > wxGTK-2.1.0-b8.tgz

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

@@ -30,7 +30,7 @@
%\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
}} }}
\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin et al} \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin et al}
\date{June 12th 1999} \date{August 6th 1999}
} }
\makeindex \makeindex
\begin{document} \begin{document}

9
include/wx/dynarray.h
View File

@@ -174,9 +174,11 @@ class WXDLLEXPORT name : public wxBaseArray \
{ \ { \
public: \ public: \
name() \ name() \
{ size_t type = sizeof(T); \ { \
size_t type = sizeof(T); \
size_t sizelong = sizeof(long); \ size_t sizelong = sizeof(long); \
wxASSERT( type <= sizelong ); \ if ( type <= sizelong ) \
{ wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); } \
} \ } \
\ \
name& operator=(const name& src) \ name& operator=(const name& src) \
@@ -237,7 +239,8 @@ public: \
name(SCMPFUNC##T fn) \ name(SCMPFUNC##T fn) \
{ size_t type = sizeof(T); \ { size_t type = sizeof(T); \
size_t sizelong = sizeof(long); \ size_t sizelong = sizeof(long); \
wxASSERT( type <= sizelong ); \ if ( type <= sizelong ) \
{ wxFAIL_MSG( _T("illegal use of DEFINE_ARRAY") ); } \
m_fnCompare = fn; \ m_fnCompare = fn; \
} \ } \
\ \

10
include/wx/resource.h
View File

@@ -88,10 +88,10 @@ class WXDLLEXPORT wxItemResource: public wxObject
inline long GetStyle() const { return m_windowStyle; } inline long GetStyle() const { return m_windowStyle; }
inline int GetId() const { return m_windowId; } inline int GetId() const { return m_windowId; }
inline long GetValue1() const { return m_value1; } inline wxInt32 GetValue1() const { return m_value1; }
inline long GetValue2() const { return m_value2; } inline wxInt32 GetValue2() const { return m_value2; }
inline long GetValue3() const { return m_value3; } inline wxInt32 GetValue3() const { return m_value3; }
inline long GetValue5() const { return m_value5; } inline wxInt32 GetValue5() const { return m_value5; }
inline wxString GetValue4() const { return m_value4; } inline wxString GetValue4() const { return m_value4; }
inline wxList& GetChildren() const { return (wxList&) m_children; } inline wxList& GetChildren() const { return (wxList&) m_children; }
inline wxStringList& GetStringValues() const { return (wxStringList&) m_stringValues; } inline wxStringList& GetStringValues() const { return (wxStringList&) m_stringValues; }
@@ -105,7 +105,7 @@ class WXDLLEXPORT wxItemResource: public wxObject
inline wxColour& GetButtonColour() const { return (wxColour&) m_buttonColour; } inline wxColour& GetButtonColour() const { return (wxColour&) m_buttonColour; }
inline void SetResourceStyle(long style) { m_exStyle = style; } inline void SetResourceStyle(long style) { m_exStyle = style; }
inline long GetResourceStyle() const { return m_exStyle; } inline wxInt32 GetResourceStyle() const { return m_exStyle; }
protected: protected:
wxList m_children; wxList m_children;

22
samples/resource/dialog1.wxr
View File

@@ -2,25 +2,25 @@ static char *dialog1 = "dialog(name = 'dialog1',\
style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\ style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\
title = 'Test dialog box',\ title = 'Test dialog box',\
id = 100,\ id = 100,\
x = 10, y = 10, width = 198, height = 147,\ x = 10, y = 10, width = 197, height = 146,\
background_colour = 'D6D6D6',\ background_colour = 'D6D6D6',\
use_dialog_units = 1,\ use_dialog_units = 1,\
use_system_defaults = 1,\ use_system_defaults = 1,\
font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss'],\ font = [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0],\
control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 184, 103,\ control = [101, wxStaticBox, 'wxStaticBox', '0', 'group6', 5, 7, 184, 103,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [102, wxRadioBox, 'Radiobox', 'wxRA_HORIZONTAL', 'radiobox2', 15, 24, 36, 58, ['One', 'Two', 'Three', 'Four'], 1,\ control = [102, wxRadioBox, 'Radiobox', 'wxRA_SPECIFY_COLS', 'radiobox2', 13, 24, 40, 72, ['One', 'Two', 'Three', 'Four', 'One more'], 1,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 62, 24, 67, 33, 'wxWindows rules!',\ control = [104, wxTextCtrl, '', 'wxTE_MULTILINE', 'multitext3', 62, 24, 67, 33, 'wxWindows rules!',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [105, wxListBox, '', '0', 'listbox4', 62, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\ control = [105, wxListBox, '', '0', 'listbox4', 62, 66, 67, 33, ['Apples', 'Bananas', 'Pears', 'Kiwis'],\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 141, 26, 36, 14, 0,\ control = [106, wxCheckBox, 'Checkbox', '0', 'checkbox9', 141, 26, 36, 14, 0,\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [107, wxStaticText, 'My Message', '0', 'message10', 143, 57, 39, 12, '',\ control = [107, wxStaticText, 'My Message', '0', 'message10', 143, 57, 39, 12, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [108, wxButton, 'Press me', '0', 'button7', 141, 81, 36, 13, '',\ control = [108, wxButton, 'Press me', '0', 'button7', 141, 81, 36, 13, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']],\ [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]],\
control = [109, wxButton, 'Cancel', '0', 'button8', 62, 119, 55, 17, '',\ control = [109, wxButton, 'Cancel', '0', 'button8', 62, 119, 55, 17, '',\
[12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'Swiss']])."; [12, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0]]).";

10
src/gtk/app.cpp
View File

@@ -414,14 +414,6 @@ bool wxApp::ProcessIdle()
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
while (node)
{
wxWindow* win = node->GetData();
win->OnInternalIdle();
node = node->GetNext();
}
return event.MoreRequested(); return event.MoreRequested();
} }
@@ -485,6 +477,8 @@ bool wxApp::SendIdleEvents( wxWindow* win )
win->ProcessEvent(event); win->ProcessEvent(event);
win->OnInternalIdle();
if (event.MoreRequested()) if (event.MoreRequested())
needMore = TRUE; needMore = TRUE;

10
src/gtk1/app.cpp
View File

@@ -414,14 +414,6 @@ bool wxApp::ProcessIdle()
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
while (node)
{
wxWindow* win = node->GetData();
win->OnInternalIdle();
node = node->GetNext();
}
return event.MoreRequested(); return event.MoreRequested();
} }
@@ -485,6 +477,8 @@ bool wxApp::SendIdleEvents( wxWindow* win )
win->ProcessEvent(event); win->ProcessEvent(event);
win->OnInternalIdle();
if (event.MoreRequested()) if (event.MoreRequested())
needMore = TRUE; needMore = TRUE;

10
utils/dialoged/src/dlghndlr.cpp
View File

@@ -29,16 +29,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#else
#include <strstream>
#endif
#include "reseditr.h" #include "reseditr.h"
#include "winprop.h" #include "winprop.h"
#include "dlghndlr.h" #include "dlghndlr.h"

10
utils/dialoged/src/reseditr.cpp
View File

@@ -44,16 +44,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#else
#include <strstream>
#endif
#ifdef __WXMSW__ #ifdef __WXMSW__
#include "wx/help.h" #include "wx/help.h"
#endif #endif

5
utils/dialoged/src/reseditr.h
View File

@@ -26,6 +26,7 @@
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/treectrl.h" #include "wx/treectrl.h"
#include "wx/proplist.h" #include "wx/proplist.h"
#include "wx/txtstrm.h"
#include "symbtabl.h" #include "symbtabl.h"
#include "winstyle.h" #include "winstyle.h"
@@ -117,7 +118,7 @@ class wxResourceTableWithSaving: public wxResourceTable
m_styleTable.Init(); m_styleTable.Init();
} }
virtual bool Save(const wxString& filename); virtual bool Save(const wxString& filename);
virtual bool SaveResource(ostream& stream, wxItemResource* item, wxItemResource* parentItem); virtual bool SaveResource(wxTextOutputStream& stream, wxItemResource* item, wxItemResource* parentItem);
void GeneratePanelStyleString(long windowStyle, char *buf); void GeneratePanelStyleString(long windowStyle, char *buf);
void GenerateDialogStyleString(long windowStyle, char *buf); void GenerateDialogStyleString(long windowStyle, char *buf);
@@ -144,7 +145,7 @@ class wxResourceTableWithSaving: public wxResourceTable
bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle); bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
*/ */
void OutputFont(ostream& stream, const wxFont& font); void OutputFont(wxTextOutputStream& stream, const wxFont& font);
wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource); wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource);
protected: protected:

25
utils/dialoged/src/reswrite.cpp
View File

@@ -29,21 +29,10 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#include <fstream.h>
#else
#include <strstream.h>
#include <fstream.h>
#endif
#else
#include <strstream>
#include <fstream>
#endif
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/wfstream.h"
#include "wx/txtstrm.h"
#include "reseditr.h" #include "reseditr.h"
@@ -60,7 +49,7 @@ wxControl *wxResourceTableWithSaving::CreateItem(wxPanel *panel, const wxItemRes
return item; return item;
} }
void wxResourceTableWithSaving::OutputFont(ostream& stream, const wxFont& font) void wxResourceTableWithSaving::OutputFont(wxTextOutputStream& stream, const wxFont& font)
{ {
stream << "[" << font.GetPointSize() << ", '"; stream << "[" << font.GetPointSize() << ", '";
stream << font.GetFamilyString() << "', '"; stream << font.GetFamilyString() << "', '";
@@ -78,10 +67,12 @@ void wxResourceTableWithSaving::OutputFont(ostream& stream, const wxFont& font)
bool wxResourceTableWithSaving::Save(const wxString& filename) bool wxResourceTableWithSaving::Save(const wxString& filename)
{ {
ofstream stream(((wxString &) filename).GetData()); wxFileOutputStream file_output( filename.fn_str() );
if (stream.bad()) if (file_output.LastError())
return FALSE; return FALSE;
wxTextOutputStream stream( file_output );
BeginFind(); BeginFind();
wxNode *node = NULL; wxNode *node = NULL;
while ((node = Next())) while ((node = Next()))
@@ -98,7 +89,7 @@ bool wxResourceTableWithSaving::Save(const wxString& filename)
return TRUE; return TRUE;
} }
bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource* item, wxItemResource* parentItem) bool wxResourceTableWithSaving::SaveResource(wxTextOutputStream& stream, wxItemResource* item, wxItemResource* parentItem)
{ {
char styleBuf[400]; char styleBuf[400];
wxString itemType(item->GetType()); wxString itemType(item->GetType());

10
utils/dialoged/src/winprop.cpp
View File

@@ -29,16 +29,6 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#if wxUSE_IOSTREAMH
#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#else
#include <strstream>
#endif
#ifdef __WXMSW__ #ifdef __WXMSW__
#include <windows.h> #include <windows.h>
#endif #endif

4
wxGTK.spec
View File

@@ -9,7 +9,7 @@ Version: %{ver}
Release: %{rel} Release: %{rel}
Copyright: wxWindows Licence Copyright: wxWindows Licence
Group: X11/Libraries Group: X11/Libraries
Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b7.tgz Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b8.tgz
URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de> Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
Requires: gtk+ >= 1.2.1 Requires: gtk+ >= 1.2.1
@@ -27,7 +27,7 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
%prep %prep
%setup -n wxGTK %setup -n wxGTK
./configure --prefix=%{pref} --enable-threads ./configure --prefix=%{pref} --enable-threads --disable-std_iostreams
%build %build
cd src && make cd src && make

4
wxMotif.spec
View File

@@ -9,7 +9,7 @@ Version: %{ver}
Release: %{rel} Release: %{rel}
Copyright: wxWindows Licence Copyright: wxWindows Licence
Group: X11/Libraries Group: X11/Libraries
Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxMotif-2.1.0-b7.tgz Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxMotif-2.1.0-b8.tgz
URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de> Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
BuildRoot: /tmp/wxmotif_root BuildRoot: /tmp/wxmotif_root
@@ -26,7 +26,7 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
%prep %prep
%setup -n wxMotif %setup -n wxMotif
./configure --prefix=%{pref} ./configure --prefix=%{pref} --disable-threads --disable-std_iostreams
%build %build
cd src && make cd src && make

2
wxWINE.spec
View File

@@ -9,7 +9,7 @@ Version: %{ver}
Release: %{rel} Release: %{rel}
Copyright: wxWindows Licence Copyright: wxWindows Licence
Group: X11/Libraries Group: X11/Libraries
Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxWINE-2.1.0-b7.tgz Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxWINE-2.1.0-b8.tgz
URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
Packager: Robert Roebling <roebling@ruf.uni-freiburg.de> Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
BuildRoot: /tmp/wxwine_root BuildRoot: /tmp/wxwine_root