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

Some warnings removed.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-02-04 11:14:41 +00:00
parent 0a9f252212
commit acbd13a365
33 changed files with 119 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distrib/msw/generic.rsp
View File

@ -335,6 +335,7 @@ samples/proplist/makefile*
samples/proplist/*.xbm samples/proplist/*.xbm
samples/proplist/*.xpm samples/proplist/*.xpm
samples/proplist/*.ico samples/proplist/*.ico
samples/proplist/*.bmp
samples/proplist/*.rc samples/proplist/*.rc
samples/layout/*.cpp samples/layout/*.cpp

11
docs/motif/install.txt
View File

@ -13,7 +13,17 @@ wxWindows 2.0 for Motif installation
files to Unix format. Don't worry about files being files to Unix format. Don't worry about files being
overwritten: they should be identical anyway. overwritten: they should be identical anyway.
- It is recommended that you install bison and flex; using yacc
and lex may require tweaking of the makefiles. You also need
Xpm (see comments in the Notes section below).
- You now have the option of using the configure-based system,
or the simple makefile system. Configure is more hard to debug
if things go wrong, but may be easier to use if they go OK :-)
Makefiles are easier to tweak.
COMPILING USING CONFIGURE COMPILING USING CONFIGURE
=========================
- You can use the wxGTK configure system to make wxMotif, or - You can use the wxGTK configure system to make wxMotif, or
you can follow the following steps to use the simpler (but you can follow the following steps to use the simpler (but
@ -54,6 +64,7 @@ COMPILING USING CONFIGURE
where it will be found by the makefile. where it will be found by the makefile.
COMPILING USING MAKEFILES COMPILING USING MAKEFILES
=========================
- Choose a .env file from src/makeenvs that matches your - Choose a .env file from src/makeenvs that matches your
environment, and copy it to src/make.env. These are the environment, and copy it to src/make.env. These are the

2
docs/motif/todo.txt
View File

@ -46,6 +46,8 @@ High Priority
- Use wxImage to load other formats into wxBitmaps, such as PNG, BMP. - Use wxImage to load other formats into wxBitmaps, such as PNG, BMP.
- Implement scaled Blit as per John Price's impementation for 1.68.
Low Priority Low Priority
------------ ------------

5
docs/msw/todo.txt
View File

@ -40,6 +40,11 @@ Implement wxToolTip
LOW PRIORITY (MEDIUM TERM) LOW PRIORITY (MEDIUM TERM)
-------------------------- --------------------------
Get wxMSW's wxGLCanvas working with non-VC++ compilers.
Generate VC++ lib project files and supply VC++ project
generator utility.
Convert remaining utilities e.g. wxGraphLayout. Convert remaining utilities e.g. wxGraphLayout.
More wxSystemSettings (see comment in settings.cpp). More wxSystemSettings (see comment in settings.cpp).

6
docs/todo.txt
View File

@ -20,10 +20,11 @@ Please see also:
- Fix TCP/IP mode in dde sample (how to use; why does it crash). - Fix TCP/IP mode in dde sample (how to use; why does it crash).
- Get Karsten to remove trashed CVS files: - Remove trashed CVS files:
include/wx/msw/magnif1.cur include/wx/msw/magnif1.cur
src/msw/ctl3d/* src/msw/ctl3d/*
utils/glcanvas/samples/isosurf/isosurf.dat.gz
and re-add them. and re-add them.
@ -32,5 +33,8 @@ Please see also:
PostgreSQL. Find out what Remstar uses and document PostgreSQL. Find out what Remstar uses and document
problems/restrictions. problems/restrictions.
- In doc/view file selector, document type is selected by
extension, not the type selected in the (Windows) file selector.
- Complete this ToDo list :-) - Complete this ToDo list :-)

10
include/wx/layout.h
View File

@ -230,11 +230,21 @@ class WXDLLEXPORT wxSizer: public wxWindow
~wxSizer(); ~wxSizer();
bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone); bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect, sizeFlags); }
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void GetSize(int *w, int *h) const; virtual void GetSize(int *w, int *h) const;
wxSize GetSize() const { return wxWindow::GetSize(); }
virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); } virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
virtual void GetPosition(int *x, int *y) const; virtual void GetPosition(int *x, int *y) const;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
inline void SizerSetSize(int x, int y, int w, int h) inline void SizerSetSize(int x, int y, int w, int h)
{ SetSize(x, y, w, h); } { SetSize(x, y, w, h); }

3
include/wx/motif/checkbox.h
View File

@ -85,7 +85,8 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); } virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); } virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void SetLabel(const wxBitmap *bitmap); virtual void SetLabel(const wxBitmap& bitmap);
virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
}; };
#endif #endif
// _WX_CHECKBOX_H_ // _WX_CHECKBOX_H_

1
include/wx/motif/mdi.h
View File

@ -175,6 +175,7 @@ public:
// MDI operations // MDI operations
virtual void Maximize(); virtual void Maximize();
virtual void Maximize(bool WXUNUSED(maximize)) { };
inline void Minimize() { Iconize(TRUE); }; inline void Minimize() { Iconize(TRUE); };
virtual void Iconize(bool iconize); virtual void Iconize(bool iconize);
virtual void Restore(); virtual void Restore();

2
include/wx/msw/checkbox.h
View File

@ -86,7 +86,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
{ wxWindow::SetSize(rect, sizeFlags); } { wxWindow::SetSize(rect, sizeFlags); }
void SetSize(const wxSize& size) { wxWindow::SetSize(size); } void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
virtual void SetLabel(const wxBitmap *bitmap); virtual void SetLabel(const wxBitmap& bitmap);
}; };
#endif #endif
// _WX_CHECKBOX_H_ // _WX_CHECKBOX_H_

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

@ -276,11 +276,15 @@
#endif #endif
// Things that don't work for 16-bit compilation
#if defined(__WXMSW__) && !defined(__WIN32__) #if defined(__WXMSW__) && !defined(__WIN32__)
#undef wxUSE_THREADS #undef wxUSE_THREADS
#define wxUSE_THREADS 0 #define wxUSE_THREADS 0
#undef wxUSE_TOOLTIPS
#define wxUSE_TOOLTIPS 0
#endif #endif
#endif #endif

2
include/wx/stubs/checkbox.h
View File

@ -75,7 +75,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
virtual void SetValue(bool); virtual void SetValue(bool);
virtual bool GetValue() const ; virtual bool GetValue() const ;
virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual void SetLabel(const wxBitmap *bitmap); virtual void SetLabel(const wxBitmap& bitmap);
}; };
#endif #endif
// _WX_CHECKBOX_H_ // _WX_CHECKBOX_H_

6
samples/controls/controls.cpp
View File

@ -407,7 +407,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) ); m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
m_checkbox->SetValue(FALSE); m_checkbox->SetValue(FALSE);
m_checkbox->SetToolTip( "Click here to disable the listbox" ); m_checkbox->SetToolTip( "Click here to disable the listbox" );
m_notebook->AddPage(panel, "wxList", TRUE, Image_List); m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List);
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices ); m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
@ -433,7 +433,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
m_textentry = new MyTextCtrl( panel, -1, "Write text here.", wxPoint(10,10), wxSize(320,28), m_textentry = new MyTextCtrl( panel, -1, "Write text here.", wxPoint(10,10), wxSize(320,28),
wxTE_PROCESS_ENTER); // wxTE_PROCESS_ENTER);
0);
(*m_textentry) << " More text."; // this text is appended (*m_textentry) << " More text."; // this text is appended
m_textentry->SetInsertionPoint(0); m_textentry->SetInsertionPoint(0);
m_textentry->WriteText("Less text."); // this text is prepended m_textentry->WriteText("Less text."); // this text is prepended

6
samples/dnd/dnd.cpp
View File

@ -24,7 +24,11 @@
#include "wx/dnd.h" #include "wx/dnd.h"
#ifdef __WXGTK__ #ifdef __WXMOTIF__
#error Sorry, drag and drop is not yet implemented on wxMotif.
#endif
#if defined(__WXGTK__) || defined(__WXMOTIF__)
#include "mondrian.xpm" #include "mondrian.xpm"
#endif #endif

2
samples/docvwmdi/docview.h
View File

@ -45,7 +45,7 @@ class MyFrame: public wxDocMDIParentFrame
wxMenu *editMenu; wxMenu *editMenu;
MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size, MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
const long type); long type);
void OnAbout(wxCommandEvent& event); void OnAbout(wxCommandEvent& event);
MyCanvas *CreateCanvas(wxView *view, wxFrame *parent); MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);

4
samples/docvwmdi/view.cpp
View File

@ -188,7 +188,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
END_EVENT_TABLE() END_EVENT_TABLE()
// Define a constructor for my canvas // Define a constructor for my canvas
MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style): MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
wxScrolledWindow(frame, -1, pos, size, style) wxScrolledWindow(frame, -1, pos, size, style)
{ {
view = v; view = v;
@ -255,7 +255,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
} }
// Define a constructor for my text subwindow // Define a constructor for my text subwindow
MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style): MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
wxTextCtrl(frame, -1, "", pos, size, style) wxTextCtrl(frame, -1, "", pos, size, style)
{ {
view = v; view = v;

4
samples/docvwmdi/view.h
View File

@ -23,7 +23,7 @@ class MyCanvas: public wxScrolledWindow
public: public:
wxView *view; wxView *view;
MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
virtual void OnDraw(wxDC& dc); virtual void OnDraw(wxDC& dc);
void OnMouseEvent(wxMouseEvent& event); void OnMouseEvent(wxMouseEvent& event);
@ -35,7 +35,7 @@ class MyTextWindow: public wxTextCtrl
public: public:
wxView *view; wxView *view;
MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style); MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
}; };
class DrawingView: public wxView class DrawingView: public wxView

2
samples/image/image.cpp
View File

@ -80,7 +80,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_PAINT(MyCanvas::OnPaint) EVT_PAINT(MyCanvas::OnPaint)
END_EVENT_TABLE() END_EVENT_TABLE()
MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size ) const wxPoint &pos, const wxSize &size )
: wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
{ {

4
samples/nativdlg/nativdlg.cpp
View File

@ -24,6 +24,10 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#ifndef __WXMSW__
#error Sorry, this sample is only appropriate under Windows.
#endif
#include "wx/resource.h" #include "wx/resource.h"
#include <ctype.h> #include <ctype.h>

17
src/make.env
View File

@ -30,13 +30,13 @@ RANLIB = ranlib
# Debug/trace mode. 1 or more for debugging. # Debug/trace mode. 1 or more for debugging.
DEBUG = 1 DEBUG = 1
GUI = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__ GUI = -D__WXSTUBS__ -D__UNIX__
GUISUFFIX = _stubs GUISUFFIX = _stubs
########################## Compiler flags ############################# ########################## Compiler flags #############################
# Misc options # Misc options
OPTIONS = -D__WXDEBUG__ OPTIONS = -D__LINUX__ -D__WXDEBUG__
COPTIONS = COPTIONS =
DEBUGFLAGS = -ggdb DEBUGFLAGS = -ggdb
INCLUDE = INCLUDE =
@ -98,19 +98,22 @@ dummy:
echo Use a target: one of motif, stubs echo Use a target: one of motif, stubs
stubs: stubs:
make -f makefile.unx all GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
motif: motif:
make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
gtk: gtk:
make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread' make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
cleanstubs: cleanstubs:
make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleanmotif: cleanmotif:
make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleangtk:
make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)

19
src/makeenvs/linux.env
View File

@ -29,14 +29,14 @@ RANLIB = ranlib
############################ Switches ################################# ############################ Switches #################################
# Debug/trace mode. 1 or more for debugging. # Debug/trace mode. 1 or more for debugging.
DEBUG = 0 DEBUG = 1
GUI = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__ GUI = -D__WXSTUBS__ -D__UNIX__
GUISUFFIX = _stubs GUISUFFIX = _stubs
########################## Compiler flags ############################# ########################## Compiler flags #############################
# Misc options # Misc options
OPTIONS = -D__WXDEBUG__ OPTIONS = -D__LINUX__ -D__WXDEBUG__
COPTIONS = COPTIONS =
DEBUGFLAGS = -ggdb DEBUGFLAGS = -ggdb
INCLUDE = INCLUDE =
@ -98,19 +98,22 @@ dummy:
echo Use a target: one of motif, stubs echo Use a target: one of motif, stubs
stubs: stubs:
make -f makefile.unx all GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
motif: motif:
make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
gtk: gtk:
make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -lXm -lXmu -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
cleanstubs: cleanstubs:
make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleanmotif: cleanmotif:
make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleangtk:
make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)

13
src/makeenvs/sgi.env
View File

@ -97,19 +97,22 @@ dummy:
echo Use a target: one of motif, stubs echo Use a target: one of motif, stubs
stubs: stubs:
make -f makefile.unx all GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
motif: motif:
make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
gtk: gtk:
make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -lXm -lXmu -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
cleanstubs: cleanstubs:
make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleanmotif: cleanmotif:
make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleangtk:
make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)

15
src/makeenvs/solaris.env
View File

@ -55,7 +55,7 @@ XLIB = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R
############################ Libraries ################################ ############################ Libraries ################################
COMPLIBS = -lgen -ldl -lsocket -lnsl COMPLIBS = -lgen -ldl -lsocket -lnsl
GUILDLIBS = -lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm GUILDLIBS = -lwx_motif $(COMPLIBS) -lpng -lzlib -lXpm -lXm -lXmu -lXt -lX11 -lm
############################# Suffixes ################################ ############################# Suffixes ################################
@ -98,19 +98,22 @@ dummy:
echo Use a target: one of motif, stubs echo Use a target: one of motif, stubs
stubs: stubs:
make -f makefile.unx all GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx all GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
motif: motif:
make -f makefile.unx all GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
gtk: gtk:
make -f makefile.unx all GUI='-D__WXGTK__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -lXm -lXmu -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread'
cleanstubs: cleanstubs:
make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleanmotif: cleanmotif:
make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__LINUX__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'
cleangtk:
make -f makefile.unx clean GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk'
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)

2
src/motif/checkbox.cpp
View File

@ -118,7 +118,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
return FALSE; return FALSE;
} }
void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap) void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
{ {
// TODO // TODO
} }

1
src/motif/dcclient.cpp
View File

@ -917,6 +917,7 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y)
#endif #endif
}; };
// TODO: use scaled Blit e.g. as per John Price's implementation in Contrib/Utilities
bool wxWindowDC::Blit( long xdest, long ydest, long width, long height, bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int rop, bool useMask ) wxDC *source, long xsrc, long ysrc, int rop, bool useMask )
{ {

2
src/msw/checkbox.cpp
View File

@ -271,7 +271,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
return TRUE; return TRUE;
} }
void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap) void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
{ {
} }

2
src/msw/makefile.bcc
View File

@ -228,7 +228,6 @@ MSWOBJS = \
$(MSWDIR)\tbarmsw.obj \ $(MSWDIR)\tbarmsw.obj \
$(MSWDIR)\textctrl.obj \ $(MSWDIR)\textctrl.obj \
$(MSWDIR)\timer.obj \ $(MSWDIR)\timer.obj \
$(MSWDIR)\tooltip.obj \
$(MSWDIR)\utils.obj \ $(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \ $(MSWDIR)\utilsexc.obj \
$(MSWDIR)\wave.obj \ $(MSWDIR)\wave.obj \
@ -239,6 +238,7 @@ MSWOBJS = \
# $(MSWDIR)\automtn.obj # $(MSWDIR)\automtn.obj
# Not used for 16-bit compilation # Not used for 16-bit compilation
# $(MSWDIR)\tooltip.obj \
# $(MSWDIR)\gauge95.obj \ # $(MSWDIR)\gauge95.obj \
# $(MSWDIR)\treectrl.obj \ # $(MSWDIR)\treectrl.obj \
# $(MSWDIR)\oleutils.obj \ # $(MSWDIR)\oleutils.obj \

2
src/msw/makefile.dos
View File

@ -195,7 +195,6 @@ MSWOBJS = \
$(MSWDIR)\tbarmsw.obj \ $(MSWDIR)\tbarmsw.obj \
$(MSWDIR)\textctrl.obj \ $(MSWDIR)\textctrl.obj \
$(MSWDIR)\timer.obj \ $(MSWDIR)\timer.obj \
$(MSWDIR)\tooltip.obj \
$(MSWDIR)\utils.obj \ $(MSWDIR)\utils.obj \
$(MSWDIR)\utilsexc.obj \ $(MSWDIR)\utilsexc.obj \
$(MSWDIR)\wave.obj \ $(MSWDIR)\wave.obj \
@ -207,6 +206,7 @@ MSWOBJS = \
# $(OLEDIR)\dataobj.obj \ # $(OLEDIR)\dataobj.obj \
# $(OLEDIR)\oleutils.obj \ # $(OLEDIR)\oleutils.obj \
# $(OLEDIR)\uuid.obj # $(OLEDIR)\uuid.obj
# $(MSWDIR)\tooltip.obj \
# TODO: Implement XPM and PNG targets in this makefile! # TODO: Implement XPM and PNG targets in this makefile!
# $(OLEDIR)\xpmhand \ # $(OLEDIR)\xpmhand \

4
src/msw/makefile.vc
View File

@ -1069,10 +1069,10 @@ $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
<< <<
$(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c
copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c copy "$(COMMDIR)"\dosyacc.c "$(COMMDIR)"\y_tab.c
$(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c
copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
######################################################## ########################################################
# Generic objects (not always compiled, depending on # Generic objects (not always compiled, depending on

4
src/msw/textctrl.cpp
View File

@ -454,6 +454,7 @@ long wxTextCtrl::GetLastPosition() const
void wxTextCtrl::Replace(long from, long to, const wxString& value) void wxTextCtrl::Replace(long from, long to, const wxString& value)
{ {
#if wxUSE_CLIPBOARD
HWND hWnd = (HWND) GetHWND(); HWND hWnd = (HWND) GetHWND();
long fromChar = from; long fromChar = from;
long toChar = to; long toChar = to;
@ -471,6 +472,9 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
// Paste into edit control // Paste into edit control
SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L); SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
#else
wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0.");
#endif
} }
void wxTextCtrl::Remove(long from, long to) void wxTextCtrl::Remove(long from, long to)

2
src/msw/tooltip.cpp
View File

@ -30,7 +30,9 @@
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
#include <commctrl.h> #include <commctrl.h>
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private classes // private classes

4
src/msw/window.cpp
View File

@ -63,7 +63,9 @@
#include <windowsx.h> #include <windowsx.h>
#endif #endif
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
#include <commctrl.h> #include <commctrl.h>
#endif
#ifndef __TWIN32__ #ifndef __TWIN32__
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
@ -185,6 +187,7 @@ bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),
WXLPARAM lParam, WXLPARAM lParam,
WXLPARAM* WXUNUSED(result)) WXLPARAM* WXUNUSED(result))
{ {
#ifdef __WIN95__
NMHDR* hdr = (NMHDR *)lParam; NMHDR* hdr = (NMHDR *)lParam;
if ( hdr->code == TTN_NEEDTEXT && m_tooltip ) if ( hdr->code == TTN_NEEDTEXT && m_tooltip )
{ {
@ -194,6 +197,7 @@ bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),
// processed // processed
return TRUE; return TRUE;
} }
#endif
return FALSE; return FALSE;
} }

2
src/stubs/checkbox.cpp
View File

@ -93,7 +93,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
return FALSE; return FALSE;
} }
void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap) void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
{ {
// TODO // TODO
} }