wxClipboard now serves the primary selection as well

wxPython fixes
  warning mesages


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-18 15:49:10 +00:00
parent 95aabccc3a
commit aeeb6a44d1
11 changed files with 196 additions and 38 deletions

41
utils/wxPython/src/Setup Normal file
View File

@@ -0,0 +1,41 @@
# This file gives the details of what is needed to build this extension
# module so the Makefile can be created.
###
### This file should be created by configure. Currently it is tweaked by hand.
###
*shared*
CCC=g++
WXWIN=~/wxWindows
GENCODEDIR=gtk
srcdir=$(GENCODEDIR)
WX_CONFIG_CFLAGS=`wx-config --cflags`
WX_CONFIG_LIBS=`wx-config --libs`
# Depending on how your Python was built, you may have to set this
# value to use the C++ driver to link with instead of the default
# C driver. For example:
MY_LDSHARED=$(CCC) -shared $(WX_CONFIG_LIBS)
# Same as above, but for statically linking Python and wxPython together,
# in other words, if you comment out the *shared* above. If this is the
# case then you should ensure that the main() function is Python's, not
# wxWindows'. You can rebuild $(WXWIN)/src/gtk/app.cpp with NOMAIN defined
# to force this...
MY_LINKCC=$(CCC)
## Pick one of these, or set your own. This is where the
## wxPython module should be installed. It should be a
## subdirectory named wxPython.
TARGETDIR=..
#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython
wxc wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \
mdi.cpp controls.cpp controls2.cpp windows2.cpp cmndlgs.cpp \
frames.cpp stattool.cpp utils.cpp \
-I. $(WX_CONFIG_CFLAGS) -DSWIG_GLOBAL

View File

@@ -152,14 +152,12 @@ public:
int GetStyle();
bool GetUnderlined();
int GetWeight();
#ifdef __WXMSW__
void SetFaceName(const wxString& faceName);
void SetFamily(int family);
void SetPointSize(int pointSize);
void SetStyle(int style);
void SetUnderlined(bool underlined);
void SetWeight(int weight);
#endif
};
//----------------------------------------------------------------------
@@ -210,24 +208,23 @@ public:
int GetCap();
wxColour& GetColour();
#ifdef __WXMSW__
// **** This one needs to return a list of ints (wxDash)
int GetDashes(wxDash **dashes);
wxBitmap* GetStipple();
#endif
int GetJoin();
int GetStyle();
int GetWidth();
bool Ok();
void SetCap(int cap_style);
void SetColour(wxColour& colour);
#ifdef __WXMSW__
void SetDashes(int LCOUNT, wxDash* LIST);
void SetStipple(wxBitmap& stipple);
#endif
void SetJoin(int join_style);
void SetStyle(int style);
void SetWidth(int width);
#ifdef __WXMSW__
// **** This one needs to return a list of ints (wxDash)
int GetDashes(wxDash **dashes);
wxBitmap* GetStipple();
void SetDashes(int LCOUNT, wxDash* LIST);
void SetStipple(wxBitmap& stipple);
#endif
};
//----------------------------------------------------------------------
@@ -505,7 +502,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.11 1998/12/18 15:49:05 RR
// wxClipboard now serves the primary selection as well
// wxPython fixes
// warning mesages
//
// Revision 1.10 1998/12/17 18:05:50 RD
//
// wxPython 0.5.2
// Minor fixes and SWIG code generation for RR's changes. MSW and GTK
// versions are much closer now!

View File

@@ -310,8 +310,8 @@ public:
void Enable(int id, bool enable);
bool Enabled(int id);
int FindMenuItem(const wxString& menuString, const wxString& itemString);
#ifdef __WXMSW__
wxMenuItem * FindItemForId(int id);
#ifdef __WXMSW__
void EnableTop(int pos, bool enable);
wxString GetHelpString(int id);
wxString GetLabel(int id);
@@ -351,7 +351,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.11 1998/12/18 15:49:10 RR
// wxClipboard now serves the primary selection as well
// wxPython fixes
// warning mesages
//
// Revision 1.10 1998/12/17 17:52:20 RD
//
// wxPython 0.5.2
// Minor fixes and SWIG code generation for RR's changes. MSW and GTK
// versions are much closer now!