From 9a05fd8d137bbe26acd4f86adf6d62c55424822c Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 28 Feb 1999 23:39:59 +0000
Subject: [PATCH] wxUSE_SOCKETS added to setup(0).h; Cygwin corrections; doc
 tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt                    | 26 +++++++++++++++++++++--
 docs/latex/wx/autoobj.tex           | 13 ------------
 docs/latex/wx/cursor.tex            |  4 ++--
 docs/latex/wx/debugcxt.tex          |  2 +-
 docs/latex/wx/manual.tex            |  2 +-
 docs/latex/wx/tconfig.tex           | 13 ++++++------
 docs/latex/wx/tdb.tex               |  6 ++----
 docs/latex/wx/tguide.tex            | 19 ++++++-----------
 docs/latex/wx/tlistctl.tex          |  2 +-
 docs/latex/wx/tresourc.tex          |  6 +-----
 docs/latex/wx/ttab.tex              | 33 -----------------------------
 docs/readme.txt                     |  4 ++--
 include/wx/generic/dcpsg.h          | 12 -----------
 include/wx/motif/mdi.h              |  1 -
 include/wx/motif/setup.h            |  2 ++
 include/wx/msw/setup0.h             |  2 ++
 include/wx/stubs/setup.h            |  2 ++
 include/wx/version.h                |  2 +-
 src/generic/dcpsg.cpp               |  1 +
 src/motif/mdi.cpp                   |  2 +-
 src/msw/checklst.cpp                |  4 ++++
 src/msw/radiobox.cpp                |  2 +-
 src/msw/treectrl.cpp                |  4 ++++
 src/msw/window.cpp                  |  6 ++++++
 utils/ogl/samples/ogledit/palette.h |  2 +-
 utils/ogl/src/Makefile.in           |  4 ++--
 26 files changed, 75 insertions(+), 101 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index fff7f682be..c74207ec04 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,8 +1,30 @@
 wxWindows 2 Change Log
 ----------------------
 
-Beta 5, February 18  1999
--------------------------
+Beta 6 (release), February 28th 1999
+------------------------------------
+
+wxGTK:
+
+- wxGLCanvas fixes.
+- Slider/spinbutton fixes.
+
+wxMSW:
+
+- Fixed problems with <return> in dialogs/panels.
+- Fixed window cursor setting.
+
+wxMotif:
+
+
+General:
+
+- Added wxUSE_SOCKETS.
+- More topic overviews.
+
+
+Beta 5, February 18th 1999
+--------------------------
 
 wxGTK:
 
diff --git a/docs/latex/wx/autoobj.tex b/docs/latex/wx/autoobj.tex
index 35467e5315..bfb0d2e6d3 100644
--- a/docs/latex/wx/autoobj.tex
+++ b/docs/latex/wx/autoobj.tex
@@ -74,19 +74,6 @@ needing to call GetProperty several times using several temporary objects. For e
 \end{verbatim}
 }
 
-\membersection{wxAutomationObject::ConvertOleToVariant}\label{wxautomationobjectconvertoletovariant}
-
-\constfunc{bool}{ConvertOleToVariant}{\param{const VARIANTARG\&}{ oleVariant}, \param{const wxVariant\&}{ variant}}
-
-Converts the given VARIANTARG object to a wxVariant. IDispatch pointers are converted to the ``void*" type.
-
-\membersection{wxAutomationObject::ConvertVariantToOle}\label{wxautomationobjectconvertvarianttoole}
-
-\constfunc{bool}{ConvertVariantToOle}{\param{const wxVariant\&}{ variant}, \param{VARIANTARG\&}{ oleVariant}}
-
-Converts the given wxVariant object to a VARIANTARG. The ``void*" type is assumed to be an
-IDispatch pointer.
-
 \membersection{wxAutomationObject::CreateInstance}\label{wxautomationobjectcreateinstance}
 
 \constfunc{bool}{CreateInstance}{\param{const wxString\&}{ classId}}
diff --git a/docs/latex/wx/cursor.tex b/docs/latex/wx/cursor.tex
index 9e5d0f41a3..a99b758cf3 100644
--- a/docs/latex/wx/cursor.tex
+++ b/docs/latex/wx/cursor.tex
@@ -88,10 +88,10 @@ Under Windows, the permitted types are:
 \twocolwidtha{6cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\windowstyle{wxBITMAP\_TYPE\_CUR}}{Load a cursor from a .cur cursor file (only if USE\_RESOURCE\_LOADING\_IN\_MSW
-is enabled in wx\_setup.h).}
+is enabled in setup.h).}
 \twocolitem{\windowstyle{wxBITMAP\_TYPE\_CUR\_RESOURCE}}{Load a Windows resource (as specified in the .rc file).}
 \twocolitem{\windowstyle{wxBITMAP\_TYPE\_ICO}}{Load a cursor from a .ico icon file (only if USE\_RESOURCE\_LOADING\_IN\_MSW
-is enabled in wx\_setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
+is enabled in setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
 \end{twocollist}}
 
 \docparam{cursorId}{A stock cursor identifier. May be one of:
diff --git a/docs/latex/wx/debugcxt.tex b/docs/latex/wx/debugcxt.tex
index 0783080462..1d85ed5db0 100644
--- a/docs/latex/wx/debugcxt.tex
+++ b/docs/latex/wx/debugcxt.tex
@@ -5,7 +5,7 @@ operations. Full functionality (such as printing out objects
 currently allocated) is only present in a debugging build of wxWindows,
 i.e. if the DEBUG symbol is defined and non-zero. wxDebugContext
 and related functions and macros can be compiled out by setting
-USE\_DEBUG\_CONTEXT to 0 is wx\_setup.h
+wxUSE\_DEBUG\_CONTEXT to 0 is setup.h
 
 \wxheading{Derived from}
 
diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 63ebf2abe7..300ed8d6a1 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -30,7 +30,7 @@
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart et al}
-\date{February 10th 1999}
+\date{February 28th 1999}
 }
 \makeindex
 \begin{document}
diff --git a/docs/latex/wx/tconfig.tex b/docs/latex/wx/tconfig.tex
index 42c046ca35..6baf8c59a5 100644
--- a/docs/latex/wx/tconfig.tex
+++ b/docs/latex/wx/tconfig.tex
@@ -12,14 +12,15 @@ The config classes provide a way to store some application configuration
 information. They were especially designed for this usage and, although may
 probably be used for many other things as well, should be limited to it. It
 means that this information should be:
-\begin{itemize}
-\item{1.} Typed, i.e. strings or numbers for the moment. You can not store
+
+\begin{enumerate}
+\item Typed, i.e. strings or numbers for the moment. You can not store
 binary data, for example.
-\item{2.} Small. For instance, it is not recommended to use the Windows
+\item Small. For instance, it is not recommended to use the Windows
 registry for amounts of data more than a couple of kilobytes.
-\item{3.} Not performance critical, neither from speed nor from a memory
+\item Not performance critical, neither from speed nor from a memory
 consumption point of view.
-\end{itemize}
+\end{enumerate}
 
 On the other hand, the features provided make them very useful for storing all
 kinds of small to medium volumes of hierarchically-organized, heterogenous
@@ -31,7 +32,7 @@ particular, these classes were designed to be as easy to use as possible.
 From another point of view, they provide an interface which hides the
 differences between the Windows registry and the standard Unix text format
 configuration files. Other (future) implementations of wxConfigBase might also
-understand GTK ressource files or their analogues on the KDE side.
+understand GTK resource files or their analogues on the KDE side.
 
 In any case, each implementation of wxConfigBase does its best to
 make the data look the same way everywhere. Due
diff --git a/docs/latex/wx/tdb.tex b/docs/latex/wx/tdb.tex
index 28c43f79b7..2682a6647d 100644
--- a/docs/latex/wx/tdb.tex
+++ b/docs/latex/wx/tdb.tex
@@ -3,10 +3,8 @@
 Classes: \helpref{wxDatabase}{wxdatabase}, \helpref{wxRecordSet}{wxrecordset}, \helpref{wxQueryCol}{wxquerycol},
 \rtfsp\helpref{wxQueryField}{wxqueryfield}
 
-\normalboxd{IMPORTANT NOTE: The ODBC classes are a preliminary release and incomplete. Please
-take this into account when using them. Feedback and bug fixes are appreciated,
-as always. The classes are being developed by Olaf Klein (oklein@smallo.ruhr.de) and
-Patrick Halke (patrick@zaphod.ruhr.de).}
+\normalboxd{Note that more sophisticated ODBC classes are provided by the Remstar
+database classes: please see the separate HTML and Word documentation.}
 
 wxWindows provides a set of classes for accessing a subset of Microsoft's ODBC (Open Database Connectivity)
 product. Currently, this wrapper is available under MS Windows only, although
diff --git a/docs/latex/wx/tguide.tex b/docs/latex/wx/tguide.tex
index 317b9dcb0e..2179ddeb56 100644
--- a/docs/latex/wx/tguide.tex
+++ b/docs/latex/wx/tguide.tex
@@ -3,11 +3,11 @@
 To set a wxWindows application going, you'll need to derive a \helpref{wxApp}{wxapp} class and
 override \helpref{wxApp::OnInit}{wxapponinit}.
 
-An application must have a top-level \helpref{wxFrame}{wxframe} window (returned by \helpref{wxApp::OnInit}{wxapponinit}),
-each frame containing one or more instances of \helpref{wxPanel}{wxpanel}, \helpref{wxSplitterWindow}{wxsplitterwindow}\rtfsp
+An application must have a top-level \helpref{wxFrame}{wxframe} or \helpref{wxDialog}{wxdialog} window.
+Each frame may contain one or more instances of classes such as \helpref{wxPanel}{wxpanel}, \helpref{wxSplitterWindow}{wxsplitterwindow}\rtfsp
 or other windows and controls.
 
-A frame can have a \helpref{wxMenuBar}{wxmenubar}, a status line, and a \helpref{wxIcon}{wxicon} for
+A frame can have a \helpref{wxMenuBar}{wxmenubar}, a \helpref{wxToolBar}{wxtoolbar}, a status line, and a \helpref{wxIcon}{wxicon} for
 when the frame is iconized.
 
 A \helpref{wxPanel}{wxpanel} is used to place controls (classes derived from \helpref{wxControl}{wxcontrol})
@@ -15,14 +15,14 @@ which are used for user interaction. Examples of controls are \helpref{wxButton}
 \rtfsp\helpref{wxCheckBox}{wxcheckbox}, \helpref{wxChoice}{wxchoice}, \helpref{wxListBox}{wxlistbox},
 \rtfsp\helpref{wxRadioBox}{wxradiobox}, \helpref{wxSlider}{wxslider}.
 
-Instances of \helpref{wxDialog}{wxdialog} can also be used for panels, items and they have
+Instances of \helpref{wxDialog}{wxdialog} can also be used for controls and they have
 the advantage of not requiring a separate frame.
 
 Instead of creating a dialog box and populating it with items, it is possible to choose
 one of the convenient common dialog classes, such as \helpref{wxMessageDialog}{wxmessagedialog}\rtfsp
 and \helpref{wxFileDialog}{wxfiledialog}.
 
-You never draw directly onto a window --- you use a {\it device context} (DC). \helpref{wxDC}{wxdc} is
+You never draw directly onto a window - you use a {\it device context} (DC). \helpref{wxDC}{wxdc} is
 the base for \helpref{wxClientDC}{wxclientdc}, \helpref{wxPaintDC}{wxpaintdc}, \helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxPostScriptDC}{wxpostscriptdc},
 \rtfsp\helpref{wxMemoryDC}{wxmemorydc}, \helpref{wxMetafileDC}{wxmetafiledc} and \helpref{wxPrinterDC}{wxprinterdc}.
 If your drawing functions have {\bf wxDC} as a parameter, you can pass any of these DCs
@@ -39,8 +39,7 @@ These might override predefined event handlers such as \helpref{wxWindow::OnChar
 
 Most modern applications will have an on-line, hypertext help system; for this, you
 need wxHelp and the \helpref{wxHelpController}{wxhelpcontroller} class to control
-wxHelp. To add sparkle, you might use the wxToolBar class
-which makes heavy use of the \helpref{wxBitmap}{wxbitmap}.
+wxHelp.
 
 GUI applications aren't all graphical wizardry. List and hash table needs are
 catered for by \helpref{wxList}{wxlist}, \helpref{wxStringList}{wxstringlist} and \helpref{wxHashTable}{wxhashtable}.
@@ -48,9 +47,5 @@ You will undoubtedly need some platform-independent \helpref{file functions}{fil
 and you may find it handy to maintain and search a list of paths using \helpref{wxPathList}{wxpathlist}.
 There's a \helpref{miscellany}{miscellany} of operating system and other functions.
 
-If you have several communicating applications, you can try out the DDE-like functions, by
-using the three classes \helpref{wxDDEClient}{wxddeclient}, \helpref{wxDDEServer}{wxddeserver} and
-\rtfsp\helpref{wxDDEConnection}{wxddeconnection}. These use DDE under Windows, and a simulation using
-sockets under UNIX.
-
+See also \helpref{Classes by Category}{classesbycat} for a list of classes.
 
diff --git a/docs/latex/wx/tlistctl.tex b/docs/latex/wx/tlistctl.tex
index 49f939255e..cb12e592af 100644
--- a/docs/latex/wx/tlistctl.tex
+++ b/docs/latex/wx/tlistctl.tex
@@ -2,5 +2,5 @@
 
 Classes: \helpref{wxListCtrl}{wxlistctrl}, \helpref{wxImageList}{wximagelist}
 
-TODO.
+Sorry, this topic has yet to be written.
 
diff --git a/docs/latex/wx/tresourc.tex b/docs/latex/wx/tresourc.tex
index 5757aed65d..86f055a611 100644
--- a/docs/latex/wx/tresourc.tex
+++ b/docs/latex/wx/tresourc.tex
@@ -328,10 +328,6 @@ object, in addition to providing \verb$#$defines for application code convenienc
 
 \subsection{Compiling the resource system}
 
-To enable the resource system, set {\bf USE\_WX\_RESOURCES} to 1 in wx\_setup.h.
+To enable the resource system, set {\bf wxUSE\_WX\_RESOURCES} to 1 in setup.h.
 If your wxWindows makefile supports it, set the same name in the makefile to 1.
 
-You will also need to compile the PrologIO utility (not always the easiest
-task): you will need YACC, and LEX (or FLEX). DOS versions of these are
-available on the AIAI ftp site under /pub/wxwin/tools.
-
diff --git a/docs/latex/wx/ttab.tex b/docs/latex/wx/ttab.tex
index d7654a09fa..d044e81936 100644
--- a/docs/latex/wx/ttab.tex
+++ b/docs/latex/wx/ttab.tex
@@ -165,39 +165,6 @@ void MyDialog::Init(void)
 \end{verbatim}
 }
 
-\subsection{wxTab change log}
-
-June 3rd 1997, Version 1.2
-
-\begin{itemize}\itemsep=0pt
-\item Fixed bug which drew some tabs incorrectly.
-\item Altered sample to put buttons below tabs, as per standard
-Windows conventions.
-\item Added improvements from Hitachi Europe Limited: draws correctly
-on Motif and Windows, and tabs are now rounded - much nicer.
-\end{itemize}
-
-April 29th 1996, Version 1.1
-
-\begin{itemize}\itemsep=0pt
-\item Added SetHorizontalTabOffset, SetHorizontalTabSpacing.
-\item Corrected bug in colouring tabs (1 pixel out).
-\item Corrected bug in adding tabs: last tab on first row could overlap right-hand
-edge.
-\item Added Layout function to allow resizing of the view rectangle and subsequent redrawing
-of the tabs.
-\item Added WXTAB\_VERSION symbol.
-\item Fixed bug in SetTabSelection which did not move the selected tab to the first row.
-\item Added argument in SetTabSelection to optionally avoid calling activation code.
-\item Changed wxPanelTabView API to allow use of any window, not just a panel, in a tab.
-\end{itemize}
-
-April 24th 1996, Version 1.0
-
-\begin{itemize}\itemsep=0pt
-\item First release.
-\end{itemize}
-
 \section{wxTabView overview}\label{wxtabviewoverview}
 
 Classes: \helpref{wxTabView}{wxtabview}, \helpref{wxPanelTabView}{wxpaneltabview}
diff --git a/docs/readme.txt b/docs/readme.txt
index bcc6c8447f..f0037ce8a3 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,5 +1,5 @@
-wxWindows 2 beta 5
-------------------
+wxWindows 2.0
+-------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
 framework for writing advanced GUI applications using (where
diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index c8704dab27..69ad11d1fb 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -135,18 +135,6 @@ protected:
   double            m_underlineThickness;
 };
 
-// A module to allow initialization/cleanup of PostScript-related
-// things without calling these functions from app.cpp.
-
-class WXDLLEXPORT wxPostScriptModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxPostScriptModule)
-public:
-    wxPostScriptModule() {}
-    bool OnInit();
-    void OnExit();
-};
-
 // TODO Needed? Should perhaps use wxGenericPrintDialog instead.
 #if 1
 #define wxID_PRINTER_COMMAND        1
diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index d27d704242..143596828a 100644
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -151,7 +151,6 @@ public:
     void SetMenuBar(wxMenuBar *menu_bar);
     void SetTitle(const wxString& title);
 
-    void SetClientSize(int width, int height);
     void GetClientSize(int *width, int *height) const;
     void GetSize(int *width, int *height) const;
     void GetPosition(int *x, int *y) const ;
diff --git a/include/wx/motif/setup.h b/include/wx/motif/setup.h
index d1e2804da4..a3c4b8cd6e 100644
--- a/include/wx/motif/setup.h
+++ b/include/wx/motif/setup.h
@@ -140,6 +140,8 @@
 
 #define wxUSE_DYNLIB_CLASS  0
                                   // Use wxLibrary
+#define wxUSE_SOCKETS       1
+                                  // Set to 1 to use socket classes
 
 /*
  * Finer detail
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 71dcff26a7..e6bf0100a9 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -167,6 +167,8 @@
 #define wxUSE_TOOLTIPS      1
                                   // Define to use wxToolTip class and
                                   // wxWindow::SetToolTip() method
+#define wxUSE_SOCKETS       1
+                                  // Set to 1 to use socket classes
 
 /*
  * Finer detail
diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h
index 49c2fe8b50..68f1572249 100644
--- a/include/wx/stubs/setup.h
+++ b/include/wx/stubs/setup.h
@@ -132,6 +132,8 @@
 
 #define wxUSE_DYNLIB_CLASS  0
                                   // Use wxLibrary
+#define wxUSE_SOCKETS       1
+                                  // Set to 1 to use socket classes
 /*
  * Finer detail
  *
diff --git a/include/wx/version.h b/include/wx/version.h
index 276361a46e..942b51a73a 100644
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -18,7 +18,7 @@
 #define wxRELEASE_NUMBER   1
 #define wxVERSION_STRING "wxWindows 2.0.1"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      5
+#define wxBETA_NUMBER      6
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif
diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 039151f007..dcd5c76c05 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -41,6 +41,7 @@
 #include "wx/stattext.h"
 #include "wx/radiobox.h"
 #include "wx/textctrl.h"
+#include "wx/prntbase.h"
 
 #include <math.h>
 
diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 03e7380770..1cad5adba2 100644
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -447,7 +447,7 @@ void wxMDIChildFrame::OnLower()
 
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
-void wxMDIChildFrame::SetClientSize(int width, int height)
+void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
     wxWindow::DoSetClientSize(width, height);
 }
diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 35c0f3ced9..dffc39d150 100644
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -44,6 +44,10 @@
 #include <windows.h>
 #include <windowsx.h>
 
+#ifdef __GNUWIN32__
+#include "wx/msw/gnuwin32/extra.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 26e5d29336..4c8017f881 100644
--- a/src/msw/radiobox.cpp
+++ b/src/msw/radiobox.cpp
@@ -780,7 +780,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
     }
 
     if ( !processed )
-        return ::CallWindowProc(s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
+        return ::CallWindowProc((WNDPROC) s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
     else
         return 0;
 }
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 9c346d6098..11547d87e6 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -40,6 +40,10 @@
 
 #include "wx/msw/private.h"
 
+#ifdef __GNUWIN32__
+#include "wx/msw/gnuwin32/extra.h"
+#endif
+
 #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
     #include <commctrl.h>
 #endif
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 437b7a3e87..a8fd5cc4e3 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1264,6 +1264,12 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             // because both usually pop up a context menu
             case VK_APPS:
                 {
+
+#ifndef GET_X_LPARAM
+#define GET_X_LPARAM(lp)                        ((int)(short)LOWORD(lp))
+#define GET_Y_LPARAM(lp)                        ((int)(short)HIWORD(lp))
+#endif
+
                     // construct the key mask
                     WPARAM fwKeys = MK_RBUTTON;
                     if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
diff --git a/utils/ogl/samples/ogledit/palette.h b/utils/ogl/samples/ogledit/palette.h
index 3d0c7ff614..00927bb635 100644
--- a/utils/ogl/samples/ogledit/palette.h
+++ b/utils/ogl/samples/ogledit/palette.h
@@ -32,7 +32,7 @@
 // TODO for wxWin: wxToolBar95 cannot be moved to a non-0,0 position!
 // Needs to have a parent window...
 // So use a simple toolbar at present.
-#ifdef __WXGTK__
+#if 0 // def __WXGTK__
 #define TOOLPALETTECLASS    wxToolBar
 #else
 #define TOOLPALETTECLASS    wxToolBarSimple
diff --git a/utils/ogl/src/Makefile.in b/utils/ogl/src/Makefile.in
index 79e3df01ff..2602f7953c 100644
--- a/utils/ogl/src/Makefile.in
+++ b/utils/ogl/src/Makefile.in
@@ -25,9 +25,9 @@ LIB_MINOR=1
 
 LIB_CPP_SRC= \
 \
- basic.cpp basic2.cpp bmpshape.cpp canvas.cpp \
+ basic.cpp basic2.cpp bmpshape.cpp canvas.cpp constrnt.cpp \
  composit.cpp divided.cpp drawn.cpp lines.cpp \
- mfutils.cpp misc.cpp ogldiag.cpp 
+ mfutils.cpp misc.cpp ogldiag.cpp
 
 #define library objects
 LIB_OBJ= \
-- 
2.50.0

