Some warnings removed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 16d214d48710dcdce4cd27906c6ca1843cf94f93..6c3d990befbb16b4b11c203fbbb02d00b47430ab 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -335,6 +335,7 @@ samples/proplist/makefile*
 samples/proplist/*.xbm
 samples/proplist/*.xpm
 samples/proplist/*.ico
+samples/proplist/*.bmp
 samples/proplist/*.rc
 
 samples/layout/*.cpp

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 80a8dce7cafb2f2238aa4df5949197ee978f9418..6062e1acb79b9e95737e4f6f44007929908c59b1 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -839,7 +839,7 @@ If execution is asynchronous, the return value is the process id,
 otherwise it is a status value.  A zero value indicates that the command could not
 be executed.
 
-If callback isn't NULL and if execution is asynchronous,
+If callback isn't NULL and if execution is asynchronous, 
 \helpref{wxProcess::OnTerminate}{wxprocessonterminate} will be called when
 the process finishes.
 

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 740a726ea9420dcddd45c4f62e93e4622d8ac28b..d6b5d2a62f3778696d0e6322455e03a68b1fd9d5 100644 (file)
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -13,7 +13,17 @@ wxWindows 2.0 for Motif installation
   files to Unix format. Don't worry about files being
   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
+=========================
 
 - You can use the wxGTK configure system to make wxMotif, or
   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.
 
 COMPILING USING MAKEFILES
+=========================
 
 - Choose a .env file from src/makeenvs that matches your
   environment, and copy it to src/make.env. These are the

diff --git a/docs/motif/todo.txt b/docs/motif/todo.txt
index 76d1ebd74bcca2edc6aa3b1d463d2bc41daa07a9..1be398bf41fe0c505d41a3f16f6041d21c227485 100644 (file)
--- a/docs/motif/todo.txt
+++ b/docs/motif/todo.txt
@@ -46,6 +46,8 @@ High Priority
 
 - 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
 ------------
 

diff --git a/docs/msw/todo.txt b/docs/msw/todo.txt
index 0fa40eff7df8adcc8332144f7fd27d9d8c813ff7..89dbba57a50ca060985f6d7b14f6b5ab07a24cb0 100644 (file)
--- a/docs/msw/todo.txt
+++ b/docs/msw/todo.txt
@@ -40,6 +40,11 @@ Implement wxToolTip
 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.
 
 More wxSystemSettings (see comment in settings.cpp).

diff --git a/docs/todo.txt b/docs/todo.txt
index 7af174dec896141e1c5e7ba519570c48f72d7200..2dc4bd4957fdb1d8e3fe2bf8148c485bb6606224 100644 (file)
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -20,10 +20,11 @@ Please see also:
 
 - 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
   src/msw/ctl3d/*
+  utils/glcanvas/samples/isosurf/isosurf.dat.gz
 
   and re-add them.
 
@@ -32,5 +33,8 @@ Please see also:
   PostgreSQL. Find out what Remstar uses and document
   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 :-)
 

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 04ae4f1401227761f363f18e1fac349a27d5c229..44a00d57b627a86d8cba0dc8dd9f20fe5acbd3ca 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -230,11 +230,21 @@ class WXDLLEXPORT wxSizer: public wxWindow
   ~wxSizer();
 
   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(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;
+  wxSize GetSize() const { return wxWindow::GetSize(); }
 
   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;
+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
 
   inline void SizerSetSize(int x, int y, int w, int h)
     { SetSize(x, y, w, h); }

diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index 187cd9aa9155d4f5efc918897317380064a831ed..ec6bd6ccea31dbf80400d58589023668e101c3e6 100644 (file)
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -85,7 +85,8 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
   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 SetLabel(const wxBitmap *bitmap);
+  virtual void SetLabel(const wxBitmap& bitmap);
+  virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
 };
 #endif
     // _WX_CHECKBOX_H_

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index a45aa1e434239b2b675ab4ecc61f53e40d5cb5ec..7abbbe9ca985a0e2ef26e8b75e1aa1c3e027df07 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -175,6 +175,7 @@ public:
 
   // MDI operations
   virtual void Maximize();
+  virtual void Maximize(bool WXUNUSED(maximize)) { };
   inline void Minimize() { Iconize(TRUE); };
   virtual void Iconize(bool iconize);
   virtual void Restore();

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index f693730f5ca3afcc034e24a3063f7a5a4ff99f60..1234ccc432c880be1fe6db6f7a56d85d4aa41b49 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -86,7 +86,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
     { wxWindow::SetSize(rect, sizeFlags); }
   void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
 
-  virtual void SetLabel(const wxBitmap *bitmap);
+  virtual void SetLabel(const wxBitmap& bitmap);
 };
 #endif
     // _WX_CHECKBOX_H_

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index f4dcb9dfd0fb451e653d6aa753c4e1c510cd2403..9e91bbdfa273c59455a91a61bd8b586f028e33d3 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -276,11 +276,15 @@
 
 #endif
 
+// Things that don't work for 16-bit compilation
 #if defined(__WXMSW__) && !defined(__WIN32__)
 
 #undef wxUSE_THREADS
 #define wxUSE_THREADS 0
 
+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+
 #endif
 
 #endif

diff --git a/include/wx/stubs/checkbox.h b/include/wx/stubs/checkbox.h
index 8bf41d99582c0e1d7827cddee1e5f54964050c10..cfc102058ab84476cb93048b4798f76410c23774 100644 (file)
--- a/include/wx/stubs/checkbox.h
+++ b/include/wx/stubs/checkbox.h
@@ -75,7 +75,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
   virtual void SetValue(bool);
   virtual bool GetValue() const ;
   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
     // _WX_CHECKBOX_H_

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 12cc3c414ccbf24770d69aa92edf8b1e5d2ba79e..a465b9e83a5c717ec9ecef6466ac4220ddfc3cc2 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -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->SetValue(FALSE);
   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);
   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);
   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->SetInsertionPoint(0);
   m_textentry->WriteText("Less text.");     // this text is prepended

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 208f397e25c5f6885a69e86b221f4e985e5a78ba..d2983beb5a3baa77c1d9d5edbde283618d6dabb3 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -24,7 +24,11 @@
 
 #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"
 #endif
 

diff --git a/samples/docvwmdi/docview.h b/samples/docvwmdi/docview.h
index 9f9b69530043467d0af7e0fe16e8ad3dbfe2357a..937c6f0e543d8b6e553ca62a7ab3e2e16db9ad4b 100644 (file)
--- a/samples/docvwmdi/docview.h
+++ b/samples/docvwmdi/docview.h
@@ -45,7 +45,7 @@ class MyFrame: public wxDocMDIParentFrame
   wxMenu *editMenu;
   
   MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
-    const long type);
+    long type);
 
   void OnAbout(wxCommandEvent& event);
   MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index ea0811077675298218bb1ba148afd801bdc823c7..56afdce5df04eb5c09901f332131eef521f1f767 100644 (file)
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -188,7 +188,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 // 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)
 {
   view = v;
@@ -255,7 +255,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 }
 
 // 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)
 {
   view = v;

diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h
index 2f068c7c049eb46e4ddb966ef34f1de5fb97acfc..e851caf6fe397f9d4337336ab70cd6085e2be0e7 100644 (file)
--- a/samples/docvwmdi/view.h
+++ b/samples/docvwmdi/view.h
@@ -23,7 +23,7 @@ class MyCanvas: public wxScrolledWindow
   public:
     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);
     void OnMouseEvent(wxMouseEvent& event);
 
@@ -35,7 +35,7 @@ class MyTextWindow: public wxTextCtrl
   public:
     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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index ecb6b59ad9870da616dbe7ef7f9923a29abea2cd..74cb31a6c75b6bf444cb98c96104cb0c005163ba 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -80,7 +80,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()
 
-MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id,
+MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 {

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 17b37c668d4c1f6361d64ff5a6e61753ff429cf0..82151d75c7ab8690f3e0cc3386e73d013f4d1c5d 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -24,6 +24,10 @@
 #include "wx/wx.h"
 #endif
 
+#ifndef __WXMSW__
+#error Sorry, this sample is only appropriate under Windows.
+#endif
+
 #include "wx/resource.h"
 
 #include <ctype.h>

diff --git a/src/make.env b/src/make.env
index 4e72c8d2d205bdc961be3770596315f6bf334cb2..1ad49be955c1601d66fe421c5acec38e5485e3f0 100644 (file)
--- a/src/make.env
+++ b/src/make.env
@@ -30,13 +30,13 @@ RANLIB      = ranlib
 
 # Debug/trace mode. 1 or more for debugging.
 DEBUG       = 1
-GUI         = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__
+GUI         = -D__WXSTUBS__ -D__UNIX__
 GUISUFFIX   = _stubs
 
 ########################## Compiler flags #############################
 
 # Misc options
-OPTIONS     = -D__WXDEBUG__
+OPTIONS     = -D__LINUX__ -D__WXDEBUG__
 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =
@@ -98,19 +98,22 @@ dummy:
        echo Use a target: one of motif, 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:
-       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:
-       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:
-       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:
-       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):
        mkdir $(OBJDIR)

diff --git a/src/makeenvs/linux.env b/src/makeenvs/linux.env
index 9d4e2aec27f2bfc6d799bd905b11e0729a623612..1ad49be955c1601d66fe421c5acec38e5485e3f0 100644 (file)
--- a/src/makeenvs/linux.env
+++ b/src/makeenvs/linux.env
@@ -29,14 +29,14 @@ RANLIB      = ranlib
 ############################ Switches #################################
 
 # Debug/trace mode. 1 or more for debugging.
-DEBUG       = 0
-GUI         = -D__WXSTUBS__ -D__LINUX__ -D__UNIX__
+DEBUG       = 1
+GUI         = -D__WXSTUBS__ -D__UNIX__
 GUISUFFIX   = _stubs
 
 ########################## Compiler flags #############################
 
 # Misc options
-OPTIONS     = -D__WXDEBUG__
+OPTIONS     = -D__LINUX__ -D__WXDEBUG__
 COPTIONS    =
 DEBUGFLAGS  = -ggdb
 INCLUDE     =
@@ -98,19 +98,22 @@ dummy:
        echo Use a target: one of motif, 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:
-       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:
-       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:
-       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:
-       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):
        mkdir $(OBJDIR)

diff --git a/src/makeenvs/sgi.env b/src/makeenvs/sgi.env
index f608bd9263f9c1bc438bd78e27bac9209beca507..42c933aa66868957d11a0a3ab204bf917df303d3 100644 (file)
--- a/src/makeenvs/sgi.env
+++ b/src/makeenvs/sgi.env
@@ -97,19 +97,22 @@ dummy:
        echo Use a target: one of motif, 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:
-       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:
-       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:
-       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:
-       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):
        mkdir $(OBJDIR)

diff --git a/src/makeenvs/solaris.env b/src/makeenvs/solaris.env
index fe5fe8f13f454b920903c1b9ff55348233ae7cf5..fa4a6fde53d56430c9a92d950959accffa8a4d05 100644 (file)
--- a/src/makeenvs/solaris.env
+++ b/src/makeenvs/solaris.env
@@ -55,7 +55,7 @@ XLIB        = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R
 ############################ Libraries ################################
 
 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 ################################
 
@@ -98,19 +98,22 @@ dummy:
        echo Use a target: one of motif, 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:
-       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:
-       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:
-       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:
-       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):
        mkdir $(OBJDIR)

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index ee43e5def37cec95d52feefc3838fe53ce697def..1641f1077cbc65a52b5d50b3eb33b3df9c017347 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -118,7 +118,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
     return FALSE;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
 {
     // TODO
 }

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 3997b771dada7bb0aa46109dccc38026fc9b7d6d..d46aa227ff59b1ff904360fb4150593235e9a7ee 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -917,6 +917,7 @@ void wxWindowDC::DrawIcon( const wxIcon &icon, long x, long y)
 #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,
                       wxDC *source, long xsrc, long ysrc, int rop, bool useMask )
 {

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 3d6baa551f109967bfa5a2b1ccd09c1e17faba1c..9308744222b2075516d14f75764f8b3e99e73c3b 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -271,7 +271,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
   return TRUE;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
 {
 }
 

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index baac105820fc5baaff827958c4e2ebfbff0237fe..240d9ac3c16401fe48753326c675af75d3c9824e 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -228,7 +228,6 @@ MSWOBJS = \
   $(MSWDIR)\tbarmsw.obj \
   $(MSWDIR)\textctrl.obj \
   $(MSWDIR)\timer.obj \
-  $(MSWDIR)\tooltip.obj \
   $(MSWDIR)\utils.obj \
   $(MSWDIR)\utilsexc.obj \
   $(MSWDIR)\wave.obj \
@@ -239,6 +238,7 @@ MSWOBJS = \
 #  $(MSWDIR)\automtn.obj
 
 # Not used for 16-bit compilation
+#  $(MSWDIR)\tooltip.obj \
 #  $(MSWDIR)\gauge95.obj \
 #  $(MSWDIR)\treectrl.obj \
 #  $(MSWDIR)\oleutils.obj \

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index 7c4eae1c5c499a42bbbd0f440a915d3ee2027532..1727d1747f84cb1ccd3452b4fa62285bcbc4a842 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -195,7 +195,6 @@ MSWOBJS = \
   $(MSWDIR)\tbarmsw.obj \
   $(MSWDIR)\textctrl.obj \
   $(MSWDIR)\timer.obj \
-  $(MSWDIR)\tooltip.obj \
   $(MSWDIR)\utils.obj \
   $(MSWDIR)\utilsexc.obj \
   $(MSWDIR)\wave.obj \
@@ -207,6 +206,7 @@ MSWOBJS = \
 #  $(OLEDIR)\dataobj.obj \
 #  $(OLEDIR)\oleutils.obj \
 #  $(OLEDIR)\uuid.obj
+#  $(MSWDIR)\tooltip.obj \
 
 # TODO: Implement XPM and PNG targets in this makefile!
 #  $(OLEDIR)\xpmhand \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 36270044ac3054ea8bba13c947c0156318962e5f..8be1b36ec8c7f5b56d49c1e7288c0ce8728fbf0e 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1069,10 +1069,10 @@ $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 <<
 
 $(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
-    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+    copy "$(COMMDIR)"\doslex.c "$(COMMDIR)"\lex_yy.c
 
 ########################################################
 # Generic objects (not always compiled, depending on

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 64f4d4314ed35b69503c8c3677871c6eae82badc..dcf18535fbb8623fc8b571b539ee7934cc0e9e93 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -454,6 +454,7 @@ long wxTextCtrl::GetLastPosition() const
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
+#if wxUSE_CLIPBOARD
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
     long toChar = to;
@@ -471,6 +472,9 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
 
     // Paste into edit control
     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)

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 73c016569739b48b6de31ce6aac08d10872a113c..7fe905694920f7e90e22ce6daa2953b84b04b5f4 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -30,7 +30,9 @@
 #include "wx/tooltip.h"
 #include "wx/msw/private.h"
 
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
 #include <commctrl.h>
+#endif
 
 // ----------------------------------------------------------------------------
 // private classes

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

diff --git a/src/stubs/checkbox.cpp b/src/stubs/checkbox.cpp
index dd2e2abe7ab8f644876b4e370b3ce0e77961ef75..258a9cc6c39bc0b89b2d57d92bd70dfe89eb7537 100644 (file)
--- a/src/stubs/checkbox.cpp
+++ b/src/stubs/checkbox.cpp
@@ -93,7 +93,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
     return FALSE;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
 {
     // TODO
 }