This commit was manufactured by cvs2svn to create tag

'OLD_CONFIGURE'.

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

Makefile

@@ -58,7 +58,7 @@ user::
 makefiles:: recreate
 Makefiles:: recreate
 recreate::
-	@setup/general/createall
+	@install/unix/setup/general/createall
 
 # the following ones define what needs to be done to distribute the 
 # library and its components

include/wx/confbase.h

@@ -23,9 +23,9 @@
 // ----------------------------------------------------------------------------
 
 // it won't compile without it anyhow
-#ifndef USE_CONFIG
-  #error "Please define USE_CONFIG or remove config.cpp from your makefile"
-#endif // USE_CONFIG
+#ifndef USE_WXCONFIG
+  #error "Please define USE_WXCONFIG or remove config.cpp from your makefile"
+#endif // USE_WXCONFIG
 
 // ----------------------------------------------------------------------------
 // constants
@@ -112,9 +112,9 @@ public:
   // Not all args will always be used by derived classes, but
   // including them all in each class ensures compatibility.
   // If appName is empty, uses wxApp name
-  wxConfigBase(const wxString& appName = "", const wxString& vendorName = "",
-               const wxString& localFilename = "", const wxString& globalFilename = "",
-               long style = 0);
+  wxConfigBase(const wxString& appName = wxEmptyString, const wxString& vendorName = wxEmptyString,
+    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString,
+    long style = 0);
 
     // empty but ensures that dtor of all derived classes is virtual
   virtual ~wxConfigBase() { }
@@ -155,7 +155,7 @@ public:
   virtual bool Read(const wxString& key, wxString *pStr) const = 0;
   virtual bool Read(const wxString& key, wxString *pStr, const wxString& defVal) const;
 
-  virtual wxString Read(const wxString& key, const wxString& defVal = "") const;
+  virtual wxString Read(const wxString& key, const wxString& defVal) const;
 
   virtual bool Read(const wxString& key, long *pl) const = 0;
   virtual bool Read(const wxString& key, long *pl, long defVal) const;

include/wx/fileconf.h

@@ -26,9 +26,9 @@
 // ----------------------------------------------------------------------------
 
 // it won't compile without it anyhow
-#ifndef USE_CONFIG
-  #error "Please define USE_CONFIG or remove fileconf.cpp from your makefile"
-#endif // USE_CONFIG
+#ifndef USE_WXCONFIG
+  #error "Please define USE_WXCONFIG or remove fileconf.cpp from your makefile"
+#endif // USE_WXCONFIG
 
 // ----------------------------------------------------------------------------
 // wxFileConfig
@@ -133,9 +133,9 @@ public:
 
    // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE
    // or wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
-  wxFileConfig(const wxString& appName, const wxString& vendorName = "",
-               const wxString& localFilename = "", const wxString& globalFilename = "",
-               long style = wxCONFIG_USE_LOCAL_FILE);
+  wxFileConfig(const wxString& appName, const wxString& vendorName = wxEmptyString,
+    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString,
+    long style = wxCONFIG_USE_LOCAL_FILE);
 
     // dtor will save unsaved data
   virtual ~wxFileConfig();
@@ -155,6 +155,18 @@ public:
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
 
+#if 0
+  virtual bool Read(wxString *pstr, const char *szKey,
+                    const char *szDefault = 0) const;
+  virtual const char *Read(const char *szKey,
+                           const char *szDefault = 0) const;
+  virtual bool Read(long *pl, const char *szKey, long lDefault) const;
+  virtual long Read(const char *szKey, long lDefault) const
+    { return wxConfigBase::Read(szKey, lDefault); }
+  virtual bool Write(const char *szKey, const char *szValue);
+  virtual bool Write(const char *szKey, long lValue);
+#endif
+
   virtual bool Read(const wxString& key, wxString *pStr) const;
   virtual bool Read(const wxString& key, wxString *pStr, const wxString& defValue) const;
   virtual bool Read(const wxString& key, long *pl) const;

include/wx/gtk/accel.h

@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      Robert
-// Modified by:
-// RCS-ID:      
-// Copyright:   (c) Robert Roebling
-// Licence:   	wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKACCELH__
-#define __GTKACCELH__
-
-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/event.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxAcceleratorEntry;
-class wxAcceleratorTable;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-extern wxAcceleratorTable wxNullAcceleratorTable;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no other key
-#define wxACCEL_NORMAL  0x00
-
-//-----------------------------------------------------------------------------
-// wxAcceleratorEntry
-//-----------------------------------------------------------------------------
-
-class wxAcceleratorEntry
-{
-  public:
-
-    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
-      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    inline void Set(int flags, int keyCode, int cmd)
-      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    inline int GetFlags() const { return m_flags; }
-    inline int GetKeyCode() const { return m_keyCode; }
-    inline int GetCommand() const { return m_command; }
-
-    int  m_flags;
-    int  m_keyCode; // ASCII or virtual keycode
-    int  m_command; // Command id to generate
-};
-
-//-----------------------------------------------------------------------------
-// wxAcceleratorTable
-//-----------------------------------------------------------------------------
-
-class wxAcceleratorTable: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-  
-  public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
-    ~wxAcceleratorTable();
-
-    inline wxAcceleratorTable(const wxAcceleratorTable& accel) 
-      { Ref(accel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* accel) 
-      { if (accel) Ref(*accel); }
-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) 
-      { if (*this == accel) return (*this); Ref(accel); return *this; }
-    inline bool operator == (const wxAcceleratorTable& accel) 
-      { return m_refData == accel.m_refData; }
-    inline bool operator != (const wxAcceleratorTable& accel) 
-      { return m_refData != accel.m_refData; }
-
-    bool Ok() const;
-    
-//  private:
-  
-    int GetCommand( wxKeyEvent &event ); 
-    
-};
-
-#endif

include/wx/gtk/app.h

@@ -15,7 +15,6 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 

include/wx/gtk/frame.h

@@ -66,6 +66,11 @@ public:
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 
+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints(int minW, int minH,
+                            int maxW = -1, int maxH = -1,
+                            int incW = -1, int incH = -1 );
+
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,

include/wx/gtk/region.h

@@ -89,46 +89,11 @@ class wxRegion : public wxGDIObject
 
     wxRegionContain Contains( long x, long y ) const;
     wxRegionContain Contains( long x, long y, long w, long h ) const;
-    wxRegionContain Contains(const wxPoint& pt) const;
-    wxRegionContain Contains(const wxRect& rect) const;
     
   public:
-  
-    wxList    *GetRectList() const;    
+    
     GdkRegion *GetRegion(void) const;
 };
 
-class wxRegionIterator: public wxObject 
-{
-  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
-  
-  public:
-  
-    wxRegionIterator(void);
-    wxRegionIterator(const wxRegion& region);
-
-    void Reset(void) { m_current = 0; }
-    void Reset(const wxRegion& region);
-
-    operator bool (void) const;
-    bool HaveRects(void) const;
-
-    void operator ++ (void);
-    void operator ++ (int);
-
-    long GetX(void) const;
-    long GetY(void) const;
-    long GetW(void) const;
-    long GetWidth(void) const { return GetW(); }
-    long GetH(void) const;
-    long GetHeight(void) const { return GetH(); }
-
-  private:
-  
-   long       m_current;
-   wxRegion   m_region;
-};
-
-
 #endif
 	// __REGIONH__

include/wx/gtk/tbargtk.h

@@ -133,6 +133,8 @@ class wxToolBar: public wxControl
   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;
+  
+  DECLARE_EVENT_TABLE()
 };
 
 #endif

include/wx/gtk/window.h

@@ -26,7 +26,6 @@
 #include "wx/dc.h"
 #include "wx/region.h"
 #include "wx/dnd.h"
-#include "wx/accel.h"
 
 //-----------------------------------------------------------------------------
 // global data
@@ -78,10 +77,8 @@ public:
            const wxString& name = wxPanelNameStr);
   virtual ~wxWindow();
 
-  virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName, 
-                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
-  virtual wxControl *CreateItem( const wxItemResource *childResource, 
-                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
 
   bool Close( bool force = FALSE );
   virtual bool Destroy();
@@ -100,8 +97,9 @@ public:
   virtual void Centre( int direction = wxHORIZONTAL );
   inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
   virtual void Fit();
-
-  virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
+    int WXUNUSED(maxH), int WXUNUSED(incW),  int WXUNUSED(incH) ) { }
 
   void OnSize( wxSizeEvent &event );
   void OnIdle( wxIdleEvent& event );
@@ -134,9 +132,6 @@ public:
   virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
 
-  virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
-  virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
-  
   bool IsBeingDeleted();
 
   void SetId( wxWindowID id );
@@ -146,12 +141,8 @@ public:
 
   virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
   virtual void Clear();
-  
-  virtual wxRegion GetUpdateRegion() const;
-  virtual bool IsExposed(int x, int y) const;
-  virtual bool IsExposed(int x, int y, int w, int h) const;
-  virtual bool IsExposed(const wxPoint& pt) const;
-  virtual bool IsExposed(const wxRect& rect) const;
+  virtual bool IsExposed( long x, long y );
+  virtual bool IsExposed( long x, long y, long width, long height );
 
   virtual wxColour GetBackgroundColour() const;
   virtual void SetBackgroundColour( const wxColour &colour );
@@ -217,6 +208,11 @@ public:
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
 
+//private:
+  virtual GtkWidget* GetConnectWidget(void);
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+
+public:
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
   virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
@@ -225,13 +221,14 @@ public:
   virtual int GetScrollRange( int orient ) const;
   virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
 
+  // return FALSE from here if the window doesn't want the focus
   virtual bool AcceptsFocus() const;
+
+  // update the UI state (called from OnIdle)
   void UpdateWindowUI();
 
-public:         // cannot get private going yet
 
-  virtual GtkWidget* GetConnectWidget(void);
-  virtual bool IsOwnGtkWindow( GdkWindow *window );
+public:         // cannot get private going yet
 
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
@@ -240,48 +237,45 @@ public:         // cannot get private going yet
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
 
-  wxWindow            *m_parent;
-  wxList               m_children;
-  int                  m_x,m_y;
-  int                  m_width,m_height;
-  int                  m_minWidth,m_minHeight;
-  int                  m_maxWidth,m_maxHeight;
-  int                  m_retCode;
-  wxEvtHandler        *m_eventHandler;
-  wxValidator         *m_windowValidator;
-  wxDropTarget        *m_pDropTarget;
-  wxWindowID           m_windowId;
-  wxCursor            *m_cursor;
-  wxFont               m_font;
-  wxColour             m_backgroundColour;
-  wxColour             m_defaultBackgroundColour;
-  wxColour             m_foregroundColour ;
-  wxColour             m_defaultForegroundColour;
-  wxRegion             m_updateRegion;
-  long                 m_windowStyle;
-  bool                 m_isShown;
-  bool                 m_isEnabled;
-  wxString             m_windowName;
-  wxAcceleratorTable   m_acceleratorTable;
+  wxWindow       *m_parent;
+  wxList          m_children;
+  int             m_x,m_y;
+  int             m_width,m_height;
+  int             m_retCode;
+  wxEvtHandler   *m_eventHandler;
+  wxValidator    *m_windowValidator;
+  wxDropTarget   *m_pDropTarget;
+  wxWindowID      m_windowId;
+  wxCursor       *m_cursor;
+  wxFont          m_font;
+  wxColour        m_backgroundColour;
+  wxColour        m_defaultBackgroundColour;
+  wxColour        m_foregroundColour ;
+  wxColour        m_defaultForegroundColour;
+  wxRegion        m_updateRegion;
+  long            m_windowStyle;
+  bool            m_isShown;
+  bool            m_isEnabled;
+  wxString        m_windowName;
 
-  GtkWidget           *m_widget;
-  GtkWidget           *m_wxwindow;
-  GtkAdjustment       *m_hAdjust,*m_vAdjust;
-  float                m_oldHorizontalPos;
-  float                m_oldVerticalPos;
-  bool                 m_needParent;
-  bool                 m_hasScrolling;
-  bool                 m_hasVMT;
-  bool                 m_sizeSet;
-  bool                 m_resizing;
+  GtkWidget      *m_widget;
+  GtkWidget      *m_wxwindow;
+  GtkAdjustment  *m_hAdjust,*m_vAdjust;
+  float           m_oldHorizontalPos;
+  float           m_oldVerticalPos;
+  bool            m_needParent;
+  bool            m_hasScrolling;
+  bool            m_hasVMT;
+  bool            m_sizeSet;
+  bool            m_resizing;
 
-public:
+public:  // Layout section
 
-  wxLayoutConstraints *m_constraints;
-  wxList              *m_constraintsInvolvedIn;
-  wxSizer             *m_windowSizer;
-  wxWindow            *m_sizerParent;
-  bool                 m_autoLayout;
+  wxLayoutConstraints * m_constraints;
+  wxList *              m_constraintsInvolvedIn;
+  wxSizer *             m_windowSizer;
+  wxWindow *            m_sizerParent;
+  bool                  m_autoLayout;
 
   wxLayoutConstraints *GetConstraints() const;
   void SetConstraints( wxLayoutConstraints *constraints );

include/wx/gtk1/accel.h

@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      Robert
-// Modified by:
-// RCS-ID:      
-// Copyright:   (c) Robert Roebling
-// Licence:   	wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKACCELH__
-#define __GTKACCELH__
-
-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/event.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxAcceleratorEntry;
-class wxAcceleratorTable;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-extern wxAcceleratorTable wxNullAcceleratorTable;
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no other key
-#define wxACCEL_NORMAL  0x00
-
-//-----------------------------------------------------------------------------
-// wxAcceleratorEntry
-//-----------------------------------------------------------------------------
-
-class wxAcceleratorEntry
-{
-  public:
-
-    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
-      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    inline void Set(int flags, int keyCode, int cmd)
-      { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    inline int GetFlags() const { return m_flags; }
-    inline int GetKeyCode() const { return m_keyCode; }
-    inline int GetCommand() const { return m_command; }
-
-    int  m_flags;
-    int  m_keyCode; // ASCII or virtual keycode
-    int  m_command; // Command id to generate
-};
-
-//-----------------------------------------------------------------------------
-// wxAcceleratorTable
-//-----------------------------------------------------------------------------
-
-class wxAcceleratorTable: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-  
-  public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
-    ~wxAcceleratorTable();
-
-    inline wxAcceleratorTable(const wxAcceleratorTable& accel) 
-      { Ref(accel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* accel) 
-      { if (accel) Ref(*accel); }
-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) 
-      { if (*this == accel) return (*this); Ref(accel); return *this; }
-    inline bool operator == (const wxAcceleratorTable& accel) 
-      { return m_refData == accel.m_refData; }
-    inline bool operator != (const wxAcceleratorTable& accel) 
-      { return m_refData != accel.m_refData; }
-
-    bool Ok() const;
-    
-//  private:
-  
-    int GetCommand( wxKeyEvent &event ); 
-    
-};
-
-#endif

include/wx/gtk1/app.h

@@ -15,7 +15,6 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/frame.h"
 

include/wx/gtk1/frame.h

@@ -66,6 +66,11 @@ public:
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void SetClientSize( int const width, int const height );
 
+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints(int minW, int minH,
+                            int maxW = -1, int maxH = -1,
+                            int incW = -1, int incH = -1 );
+
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,

include/wx/gtk1/region.h

@@ -89,46 +89,11 @@ class wxRegion : public wxGDIObject
 
     wxRegionContain Contains( long x, long y ) const;
     wxRegionContain Contains( long x, long y, long w, long h ) const;
-    wxRegionContain Contains(const wxPoint& pt) const;
-    wxRegionContain Contains(const wxRect& rect) const;
     
   public:
-  
-    wxList    *GetRectList() const;    
+    
     GdkRegion *GetRegion(void) const;
 };
 
-class wxRegionIterator: public wxObject 
-{
-  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
-  
-  public:
-  
-    wxRegionIterator(void);
-    wxRegionIterator(const wxRegion& region);
-
-    void Reset(void) { m_current = 0; }
-    void Reset(const wxRegion& region);
-
-    operator bool (void) const;
-    bool HaveRects(void) const;
-
-    void operator ++ (void);
-    void operator ++ (int);
-
-    long GetX(void) const;
-    long GetY(void) const;
-    long GetW(void) const;
-    long GetWidth(void) const { return GetW(); }
-    long GetH(void) const;
-    long GetHeight(void) const { return GetH(); }
-
-  private:
-  
-   long       m_current;
-   wxRegion   m_region;
-};
-
-
 #endif
 	// __REGIONH__

include/wx/gtk1/tbargtk.h

@@ -133,6 +133,8 @@ class wxToolBar: public wxControl
   
     GtkToolbar   *m_toolbar;
     wxList        m_tools;
+  
+  DECLARE_EVENT_TABLE()
 };
 
 #endif

include/wx/gtk1/window.h

@@ -26,7 +26,6 @@
 #include "wx/dc.h"
 #include "wx/region.h"
 #include "wx/dnd.h"
-#include "wx/accel.h"
 
 //-----------------------------------------------------------------------------
 // global data
@@ -78,10 +77,8 @@ public:
            const wxString& name = wxPanelNameStr);
   virtual ~wxWindow();
 
-  virtual bool LoadFromResource( wxWindow *parent, const wxString& resourceName, 
-                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
-  virtual wxControl *CreateItem( const wxItemResource *childResource, 
-                                 const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = (const wxResourceTable *) NULL);
+  virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = (const wxResourceTable *) NULL);
 
   bool Close( bool force = FALSE );
   virtual bool Destroy();
@@ -100,8 +97,9 @@ public:
   virtual void Centre( int direction = wxHORIZONTAL );
   inline void Center(int direction = wxHORIZONTAL) { Centre(direction); }
   virtual void Fit();
-
-  virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
+    // set minimal/maxmimal size for the frame
+  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW),
+    int WXUNUSED(maxH), int WXUNUSED(incW),  int WXUNUSED(incH) ) { }
 
   void OnSize( wxSizeEvent &event );
   void OnIdle( wxIdleEvent& event );
@@ -134,9 +132,6 @@ public:
   virtual wxValidator *GetValidator();
   virtual void SetValidator( const wxValidator &validator );
 
-  virtual void SetAcceleratorTable( const wxAcceleratorTable& accel );
-  virtual wxAcceleratorTable *GetAcceleratorTable() { return &m_acceleratorTable; }
-  
   bool IsBeingDeleted();
 
   void SetId( wxWindowID id );
@@ -146,12 +141,8 @@ public:
 
   virtual void Refresh( bool eraseBackground = TRUE, const wxRect *rect = (const wxRect *) NULL );
   virtual void Clear();
-  
-  virtual wxRegion GetUpdateRegion() const;
-  virtual bool IsExposed(int x, int y) const;
-  virtual bool IsExposed(int x, int y, int w, int h) const;
-  virtual bool IsExposed(const wxPoint& pt) const;
-  virtual bool IsExposed(const wxRect& rect) const;
+  virtual bool IsExposed( long x, long y );
+  virtual bool IsExposed( long x, long y, long width, long height );
 
   virtual wxColour GetBackgroundColour() const;
   virtual void SetBackgroundColour( const wxColour &colour );
@@ -217,6 +208,11 @@ public:
   virtual void SetDropTarget( wxDropTarget *dropTarget );
   virtual wxDropTarget *GetDropTarget() const;
 
+//private:
+  virtual GtkWidget* GetConnectWidget(void);
+  virtual bool IsOwnGtkWindow( GdkWindow *window );
+
+public:
   virtual void SetScrollbar( int orient, int pos, int thumbVisible,
     int range, bool refresh = TRUE );
   virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
@@ -225,13 +221,14 @@ public:
   virtual int GetScrollRange( int orient ) const;
   virtual void ScrollWindow( int dx, int dy, const wxRect* rect = (wxRect *) NULL );
 
+  // return FALSE from here if the window doesn't want the focus
   virtual bool AcceptsFocus() const;
+
+  // update the UI state (called from OnIdle)
   void UpdateWindowUI();
 
-public:         // cannot get private going yet
 
-  virtual GtkWidget* GetConnectWidget(void);
-  virtual bool IsOwnGtkWindow( GdkWindow *window );
+public:         // cannot get private going yet
 
   void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
     const wxSize &size, long style, const wxString &name );
@@ -240,48 +237,45 @@ public:         // cannot get private going yet
   virtual void ImplementSetSize();
   virtual void ImplementSetPosition();
 
-  wxWindow            *m_parent;
-  wxList               m_children;
-  int                  m_x,m_y;
-  int                  m_width,m_height;
-  int                  m_minWidth,m_minHeight;
-  int                  m_maxWidth,m_maxHeight;
-  int                  m_retCode;
-  wxEvtHandler        *m_eventHandler;
-  wxValidator         *m_windowValidator;
-  wxDropTarget        *m_pDropTarget;
-  wxWindowID           m_windowId;
-  wxCursor            *m_cursor;
-  wxFont               m_font;
-  wxColour             m_backgroundColour;
-  wxColour             m_defaultBackgroundColour;
-  wxColour             m_foregroundColour ;
-  wxColour             m_defaultForegroundColour;
-  wxRegion             m_updateRegion;
-  long                 m_windowStyle;
-  bool                 m_isShown;
-  bool                 m_isEnabled;
-  wxString             m_windowName;
-  wxAcceleratorTable   m_acceleratorTable;
+  wxWindow       *m_parent;
+  wxList          m_children;
+  int             m_x,m_y;
+  int             m_width,m_height;
+  int             m_retCode;
+  wxEvtHandler   *m_eventHandler;
+  wxValidator    *m_windowValidator;
+  wxDropTarget   *m_pDropTarget;
+  wxWindowID      m_windowId;
+  wxCursor       *m_cursor;
+  wxFont          m_font;
+  wxColour        m_backgroundColour;
+  wxColour        m_defaultBackgroundColour;
+  wxColour        m_foregroundColour ;
+  wxColour        m_defaultForegroundColour;
+  wxRegion        m_updateRegion;
+  long            m_windowStyle;
+  bool            m_isShown;
+  bool            m_isEnabled;
+  wxString        m_windowName;
 
-  GtkWidget           *m_widget;
-  GtkWidget           *m_wxwindow;
-  GtkAdjustment       *m_hAdjust,*m_vAdjust;
-  float                m_oldHorizontalPos;
-  float                m_oldVerticalPos;
-  bool                 m_needParent;
-  bool                 m_hasScrolling;
-  bool                 m_hasVMT;
-  bool                 m_sizeSet;
-  bool                 m_resizing;
+  GtkWidget      *m_widget;
+  GtkWidget      *m_wxwindow;
+  GtkAdjustment  *m_hAdjust,*m_vAdjust;
+  float           m_oldHorizontalPos;
+  float           m_oldVerticalPos;
+  bool            m_needParent;
+  bool            m_hasScrolling;
+  bool            m_hasVMT;
+  bool            m_sizeSet;
+  bool            m_resizing;
 
-public:
+public:  // Layout section
 
-  wxLayoutConstraints *m_constraints;
-  wxList              *m_constraintsInvolvedIn;
-  wxSizer             *m_windowSizer;
-  wxWindow            *m_sizerParent;
-  bool                 m_autoLayout;
+  wxLayoutConstraints * m_constraints;
+  wxList *              m_constraintsInvolvedIn;
+  wxSizer *             m_windowSizer;
+  wxWindow *            m_sizerParent;
+  bool                  m_autoLayout;
 
   wxLayoutConstraints *GetConstraints() const;
   void SetConstraints( wxLayoutConstraints *constraints );

include/wx/msw/bitmap.h

@@ -197,19 +197,6 @@ public:
   inline wxDC *GetSelectedInto(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_selectedInto : NULL); }
   bool FreeResource(bool force = FALSE);
 
-  // Creates a bitmap that matches the device context's depth, from
-  // an arbitray bitmap. At present, the original bitmap must have an
-  // associated palette. (TODO: use a default palette if no palette exists.)
-  // This function is necessary for you to Blit an arbitrary bitmap (which may have
-  // the wrong depth). wxDC::SelectObject will compare the depth of the bitmap
-  // with the DC's depth, and create a new bitmap if the depths differ.
-  // Eventually we should perhaps make this a public API function so that
-  // an app can efficiently produce bitmaps of the correct depth.
-  // The Windows solution is to use SetDibBits to blit an arbotrary DIB directly to a DC, but
-  // this is too Windows-specific, hence this solution of quietly converting the wxBitmap.
-  // Contributed by Frederic Villeneuve <frederic.villeneuve@natinst.com>
-  wxBitmap GetBitmapForDC(wxDC& dc) const;
-
 };
 #endif
   // _WX_BITMAP_H_

include/wx/msw/dc.h

@@ -261,10 +261,6 @@ public:
     GetClippingBox(&x, &y, &w, &h); rect.x = x; rect.y = y; rect.width = w; rect.height = h;
   }
 
-  // This should probably be made available on other platforms
-  int wxDC::GetDepth(void) const ;
-
-// Implementation
   virtual void SetRop(WXHDC cdc);
   virtual void DoClipping(WXHDC cdc);
   virtual void SelectOldObjects(WXHDC dc);

include/wx/object.h

@@ -78,7 +78,7 @@ class WXDLLEXPORT wxClassInfo
 
 wxObject* WXDLLEXPORT wxCreateDynamicObject(char *name);
 
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
 wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
 #endif
 
@@ -183,7 +183,7 @@ class WXDLLEXPORT wxObject
   virtual void Dump(ostream& str);
 #endif
 
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
@@ -199,7 +199,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData *m_refData;
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
   wxObject_Serialize *m_serialObj;
 #endif
 };

include/wx/setup.h

@@ -19,7 +19,7 @@
 #elif defined(__WXSTUBS__)
 #include "wx/stubs/setup.h"
 #elif defined(__WXGTK__)
-#include "wx/../../setup/setup.h"
+#include "wx/../../install/unix/setup/setup.h"
 #endif
 
 #endif

include/wx/wx.h

@@ -65,7 +65,7 @@
 #include "wx/dirdlg.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif

install/unix/INSTALL

@@ -0,0 +1,410 @@
+* General
+----------
+
+The Unix variants of wxWindows use GNU configure. If you have problems 
+with your make use GNU make instead.
+
+Read my homepage at 
+
+  http://www.freiburg.linux.de/~wxxt
+  
+for newest information.
+
+* GUI libraries
+-----------------------
+
+wxWindows requires a GUI toolkit to be installed. Does that make
+sense? So far only the GTK is supported, but we hope to provide
+the choice between GTK, Qt, Motif/Lesstif in the not so distant 
+future.
+
+You can get the newest version of the GTK from the GTK homepage
+at
+  http://www.gtk.org
+  
+The newest versin of Qt can be downloaded for free from the Trolltec's 
+site at
+  http://www.troll.no
+
+Lesstif can be downloaded from their site
+at
+  http://www.lesstif.org
+
+If you want to develop using Motif, you need to buy it, unless it comes
+with your operating system such as all commercial Unices, as well as
+RedHat's, SuSe's and probably other's Linux Motif editions.
+
+* Additional libraries
+-----------------------
+
+There will be a few more features of wxWindows, which will 
+require further libraries (on some platforms). These
+features will be optional. I hope to teach configure
+to check that out automatically.
+
+Thread support:
+
+  Requires pthreads under Linux with glibc 2. pthreads are
+  always present on such systems, so just compile, unless
+  you have RedHat 5.0, which has a broken combination of
+  glibc 2 and X. In this case, you have to run configure
+  with "--without-threads".
+  
+  Requires PCthreads under Linux with libc 5. If you
+  haven't installed pcthreads, there will be no thread
+  support in wxWindows, but the library will compile.
+  
+  Requires Posix threads on commercial Unix system,
+  which are always present. Just compile.
+  
+  On SGI Irix we first look for sprocs, then pthreads and
+  use the last one found.
+  
+Python scripting language support:
+
+  Requires Python. Soon to come.
+  
+* Other things to do
+-----------------------------
+
+wxGTK and wxMotif/wxLesstif require the built-in
+ImLib/GdkImlib to be configured. For that purpose
+copy the two files from /misc/imlib to your
+home directory and rename "imrc" -> ".imrc".
+You may also edit imrc by hand as you like. 
+The palette file is required when using
+wxWindows in 256-colour mode.
+
+If you want to use wxWindows's ODBC support, you'll have
+to create a .odbc.ini file. The readme file in 
+~/src/iodbc tells you what to do.
+
+
+* Create your configuration
+-----------------------------
+
+This must be done in /install/unix
+
+Usage:
+	./configure options
+
+If you want to use system's C and C++ compiler,
+set environment variables CC and CCC as
+
+	% setenv CC cc
+	% setenv CCC CC
+	% ./configure options
+
+Using the SGI native compilers, it is recommended that you
+also set CFLAGS and CXXFLAGS before running configure. These 
+should be set to :
+
+CFLAGS="-mips3 -n32" 
+CXXFLAGS="-mips3 -n32"
+
+This is essential if you want to use the resultant binaries 
+on any other machine than the one it was compiled on. If you 
+have a 64bit machine (Octane) you should also do this to ensure 
+you don't accidently build the libraries as 64bit (which is 
+untested).
+
+The SGI native compiler support has only been tested on Irix 6.5.
+
+to see all the options please use:
+
+	./configure --help
+
+The basic philosophy is that if you want to use different
+configurations, like a debug and a release version, 
+or use the same source tree on different systems,
+you have only to change the environment variable OSTYPE.
+(Sadly this variable is not set by default on some systems
+in some shells - on SGI's for example). So you will have to 
+set it there. This variable HAS to be set before starting 
+configure, so that it knows which system it tries to 
+configure for.
+
+Configure will complain if the system variable OSTYPE has 
+not been defined. And Make in some circumstances as well...
+
+
+* General options
+-------------------
+
+Obviously, you have to choose a toolkit. You must do this by
+running configure with either of
+
+        --with-gtk               Use the GIMP ToolKit (GTK)
+	
+	--with-qt                Use Qt from TrollTec
+	
+	--with-motif             Use either Motif or Lesstif
+	                         Configure will look for both. 
+
+The following options handle the kind of library you want to build.
+
+	--without-threads       Compile without thread support.
+
+	--with-shared           Create shared libraries.
+
+	--without-optimise	Do not optimise the code.
+
+	--with-profile          Add profiling info to the object 
+				files. Currently broken, I think.
+				
+	--with-mem_tracing      Add built-in memory tracing. 
+	                        This doesn't work well with gcc.
+				
+	--with-dmalloc          Use the dmalloc memory debugger.
+	                        Read more at www.letters.com/dmalloc/
+				
+	--with-debug_info	Add debug info to object files and
+	                        executables.
+
+	--with-debug_flag	Define __DEBUG__ and __WXDEBUG__ when
+	                        compiling.
+
+* Feature Options
+-------------------
+
+When using the Windows version of wxWindows, it is possible
+to edit the file /include/wx/msw/setup.h in order to enable
+or disable some features of wxWindows so that the resulting
+binaries get smaller.
+
+As I don't yet care for binary size and target mainly at
+producing a shared library, wxWindows's configure system auto-
+matically enables all features, as long as they are already
+implemented.
+
+* Compiling
+-------------
+
+The following must be done in the base directory (e.g. ~/wxGTK
+or ~/wxWin)
+
+First you have to create all makefiles in all subdirectories:
+
+	make Makefiles
+
+Dependencies are generated automatically using
+
+	make depend
+	
+(For some reason, this doesn't seem to work completely.)
+
+Now the makefiles are created you can compile everything is as simple
+as typing:
+
+	make
+
+make yourself some coffee, as it will try to compile
+ALL the files in this distribution.
+
+if you want to be more selective:
+
+	make src	will build only the base libraries
+	make utils	will build the utils
+	make samples	will build the samples
+	make other	will build the other samples
+	make user	will build the files in the directory other
+
+Depending on the configuration of some files, the libraries
+and binaries will be placed in different directories.
+The "global" binaries and libraries will be placed in:
+
+	bin/$(OSTYPE) and
+	lib/$(OSTYPE) respectively
+
+"local" binaries and libraries will be placed in:
+
+	(basedir of that application)/$(OSTYPE).
+
+This is also the place where all the object-files will go.
+
+If you want to conserve disk space by removing unnecessary
+object-files:
+
+	 make clean_obj
+
+will do the work for you.
+
+* Creating a new Project
+--------------------------
+
+I propose to put all contributed programs in the directory
+"~/wxWin/user", with a directory of its own.
+
+This directory then should include the following files:
+
+Makefile        (You can copy this one from any application in samples
+                 probably you will not need to edit this one. There is
+                 only one case where you might be interested in changing
+                 this file, but about that see later.)
+Makefile.in	(This is the base application-Makefile template, from
+                 which the actual Makefile for each system is created.
+                 More about this later)
+
+put ALL your source code along with all the other stuff you need for
+your application in this directory (subdirectories are welcome).
+
+** Something about Makefiles
+------------------------------
+
+On general principle it should only contain ONE line, which is as follows:
+
+	include ../../src/unix/setup/general/makeapp
+
+this will include all the necessary definitions for creating the applications
+
+the only case where you might want to add another line is the following:
+this version of configure also supports creation of source archives of the
+application for easy distribution and updates to newer version of wxWindows.
+    For this purpose all files in the application-directory will be put into
+a gziped tar-file in the full notation user/<your application>/*
+if you want to include some other files that you want "more visible", like
+a README.<yourApp> or a shell script for easy 
+compilation/installation/distribution, then you have to add a variable
+
+	DISTRIBUTE_ADDITIONAL=<your files>
+
+to the Makefile.
+So it would look like this:
+
+	DISTRIBUTE_ADDITIONAL=README.TheApp
+	include ../../src/unix/setup/general/makeapp
+
+As we have already talked about distribution the command to create a 
+distribution is:
+
+	make distrib
+
+NOTE: If you are in the base directory of wxWindows it will create 
+distribution packages for wxWindows as well as for all packages in the
+user directory.
+    So if you want to create only packages for the files in user,
+then go to the directory other and type:
+
+	make distrib
+
+or if you only want one application to be created then
+enter the specific directory and type there:
+make distrib
+
+All the distribution files will be put in the directory
+distrib at the base of the wxWindows-tree (where also configure
+and template.mak can be found).
+
+** Something about Makefile.in
+--------------------------------
+
+As you have already seen with Makefile, configure makes a lot of use
+if the include statement in make to keep the Makefiles as simple as 
+possible.
+
+So basically there are only variables to define and then a include command.
+Exception to this rule is if you have special rules for some stuff...
+These rules should go AFTER the include statement!!!
+
+so the general header looks like this:
+
+	# wxWindows base directory
+	WXBASEDIR=@WXBASEDIR@
+	# set the OS type for compilation
+	OS=@OS@
+	# compile a library only
+	RULE=bin
+
+and the general footer will look like this:
+
+	# include the definitions now
+	include ../../../template.mak
+
+the key variable is RULE, which defines what make should create
+in this directory.
+
+here are some examples:
+
+  RULE	  description              
+  ===========================================================================
+  bin	  creates a local binary (for a global binary prefix bin with g)
+  	  additional variables needed:
+  		BIN_TARGET	this gives the name of your application
+  		BIN_OBJ		this gives the object files needed to
+  				link the application
+  	  optional variables are:
+  		BIN_SRC		this gives the list of c/c++ files for
+  				which dependencies will be checked.
+  				(This can be achieved with: make depend)
+  		BIN_LINK	this gives commands for additional
+  				libraries needed to link the application
+  ---------------------------------------------------------------------------
+  bin2	  creates two local binaries (for global binaries prefix bin2 with g)
+  	  in addition to the variables specified above you MUST also
+  	  provide the same variables with BIN2_ instead of BIN_
+  ---------------------------------------------------------------------------
+  lib	  creates a local library (for a global binary prefix bin with g)
+  	  additional variables needed:
+  		LIB_TARGET	this gives the name of your library
+  		LIB_OBJ		this gives the object files needed for
+  				the library to be build.
+  	  optional variables are:
+  		LIB_SRC		this gives the list of c/c++ files for
+  				which dependencies will be checked.
+  	  libbin and libgbin are also possible and will need in addition
+  	  the variables from bin
+  ---------------------------------------------------------------------------
+  gslib	  is similar to lib, but it creates a shared library if the system
+  	  supports it.
+  	  additional variables needed:
+  		LIB_MAJOR	major number of the shared library
+  		LIB_MINOR	minor number of the shared library
+  ---------------------------------------------------------------------------
+  other additional variables:
+
+  	  ADD_COMPILE	   define additional includes/defines that
+  			   are needed to compile the object files
+  			   (if you need to reference some directory
+  			   utils - like wxGrid -, then please 
+  			   reference them with the variables defined
+  			   in template.mak - e.g.: $(SRCDIR),$(UTILS),
+  			   $(SAMPLES),$(OTHERS))
+
+  	  NEEDED_DEFINES   lists all the defines that HAVE to be set in
+  			   /include/wx/setup.h to compile correctly.
+
+	  SRC_DIR	   lists all directories that are needed to
+			   compile. (i.e: lists all the directories,
+			   where there are source-files.) But it is 
+			   also needed to clean an object and for 
+			   machines, for which make does not support 
+			   VPATH
+
+currently there are the following compiling rules provided:
+object files are created for the following file extensions:
+.c .cc .cpp
+
+Please have a closer look at the Makefiles in this distribution.
+
+* Platforms configure is working with
+---------------------------------------
+
+Please report build succes on any machine. Especially non-
+Linux operating systems (which I don't have).
+
+Original author of the autoconf system for wxxt-1.66 and for this INSTALL
+file:
+
+	Martin Sperl	sperl@dsn.ast.univie.ac.at
+	
+Ported to wxGTK 0.1:
+
+	Wolfram Gloger  wmglo@dent.med.uni-muenchen.de
+
+Thanks alot to both of them.
+
+In the hope that it will be useful,
+
+        Robert Roebling roebling@sun2.ruf.uni-freiburg.de
+	
+	

install/unix/configure.in

@@ -14,9 +14,9 @@ AC_DEFUN(AM_PATH_GTK,
 [dnl 
 dnl Get the cflags and libraries from the gtk-config script
 dnl
-AC_ARG_WITH(gtk-prefix,[**--with-gtk-prefix=PFX   Prefix where GTK is installed],
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
             gtk_config_prefix="$withval", gtk_config_prefix="")
-AC_ARG_WITH(gtk-exec-prefix,[**--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed],
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
             gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
 
   if test x$gtk_config_exec_prefix != x ; then
@@ -226,7 +226,9 @@ dnl ------------------------------------------------------------------------
 dnl Set base directory
 dnl ------------------------------------------------------------------------
 
+cd ../..
 WXBASEDIR=`pwd`
+cd install/unix
 AC_SUBST(WXBASEDIR)
 
 dnl ------------------------------------------------------------------------
@@ -653,70 +655,62 @@ DEFAULT_USE_DEBUG_FLAG=0
 DEFAULT_USE_DEBUG_INFO=0
 DEFAULT_USE_MEM_TRACING=0
 DEFAULT_USE_DMALLOC=0
-DEFAULT_USE_APPLE_IEEE=1
-DEFAULT_USE_IOSTREAMH=1
 
 DEFAULT_USE_ZLIB=1
 DEFAULT_USE_GDK_IMLIB=1
 DEFAULT_USE_LIBPNG=1
 DEFAULT_USE_ODBC=1
 
-DEFAULT_USE_GAUGE=1
-DEFAULT_USE_SCROLLBAR=1
-DEFAULT_USE_LISTCTRL=1
-DEFAULT_USE_TREECTRL=1
-DEFAULT_USE_GRID=1
-DEFAULT_USE_TAB_DIALOG=1
-DEFAULT_USE_NOTEBOOK=1
-
-DEFAULT_USE_TIMEDATE=1
-DEFAULT_USE_FRACTION=1
-DEFAULT_USE_LOG=1
-DEFAULT_USE_INTL=1
-DEFAULT_USE_CONFIG=1
-DEFAULT_USE_STREAMS=1
-DEFAULT_USE_SERIAL=1
-DEFAULT_USE_FILE=1
-DEFAULT_USE_TEXTFILE=1
-
+DEFAULT_USE_APPLE_IEEE=1
+DEFAULT_USE_STORABLE_CLASSES=1
+DEFAULT_USE_AUTOTRANS=1
 DEFAULT_USE_AFM_FOR_POSTSCRIPT=1
 DEFAULT_WX_NORMALIZED_PS_FONTS=1
-DEFAULT_USE_POSTSCRIPT=1
 
+DEFAULT_USE_IOSTREAMH=1
+
+DEFAULT_USE_OPENGL=0
+
+DEFAULT_USE_WXCONFIG=1
+DEFAULT_USE_POSTSCRIPT=1
 DEFAULT_USE_IPC=1
 DEFAULT_USE_RESOURCES=1
+DEFAULT_USE_TIMEDATE=1
+DEFAULT_USE_FRACTION=1
 DEFAULT_USE_CONSTRAINTS=1
-DEFAULT_USE_CLIPBOARD=0
-DEFAULT_USE_DND=1
-
-DEFAULT_USE_MDI_ARCHITECTURE=1
+DEFAULT_USE_TOOLBAR=1
+DEFAULT_USE_GAUGE=1
+DEFAULT_USE_SCROLLBAR=1
 DEFAULT_USE_DOC_VIEW_ARCHITECTURE=1
 DEFAULT_USE_PRINTING_ARCHITECTURE=1
 
-DEFAULT_USE_PROLOGIO=1
-DEFAULT_USE_WX_RESOURCES=1
-DEFAULT_USE_RPC=0
-
-DEFAULT_USE_OPENGL=0
 DEFAULT_USE_METAFILE=0
+DEFAULT_USE_HELP=0
+DEFAULT_USE_CLIPBOARD=0
+DEFAULT_USE_VLBOX=0
 DEFAULT_USE_WXGRAPH=0
 DEFAULT_USE_WXTREE=0
-DEFAULT_USE_HELP=0
+DEFAULT_USE_ENHANCED_DIALOG=0
+
+DEFAULT_USE_FORM=0
+DEFAULT_USE_PROLOGIO=1
+DEFAULT_USE_RPC=0
+DEFAULT_USE_WX_RESOURCES=1
 
 dnl ----------------------------------------------------------------
 dnl toolkit options
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(gtk,gtk,
-**--with-gtk              use GTK,
+**--with-gtk           use GTK,
 USE_GTK)
 
 AC_OVERRIDES(qt,qt,
-**--with-qt               use Qt,
+**--with-qt           use Qt,
 USE_QT)
 
 AC_OVERRIDES(motif,motif,
-**--with-motif            use Motif/Lesstif,
+**--with-motif           use Motif/Lesstif,
 USE_MOTIF)
 
 dnl ----------------------------------------------------------------
@@ -728,7 +722,7 @@ AC_OVERRIDES(shared,shared,
 USE_SHARED)
 
 AC_OVERRIDES(optimise,optimise,
-**--with-optimise         create optimised code,
+**--with-optimise      create optimised code,
 USE_OPTIMISE)
 
 AC_OVERRIDES(debug_flag,debug_flag,
@@ -736,7 +730,7 @@ AC_OVERRIDES(debug_flag,debug_flag,
 USE_DEBUG_FLAG)
 
 AC_OVERRIDES(debug_info,debug_info,
-**--with-debug_info       create code with debuging information,
+**--with-debug_info       create code with debuging information included,
 USE_DEBUG_INFO)
 
 AC_OVERRIDES(mem_tracing,mem_tracing,
@@ -744,23 +738,19 @@ AC_OVERRIDES(mem_tracing,mem_tracing,
 USE_MEM_TRACING)
 
 AC_OVERRIDES(dmalloc,dmalloc,
-**--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/),
+**--with-dmalloc           use dmalloc memory debug library (www.letters.com/dmalloc/),
 USE_DMALLOC)
 
 AC_OVERRIDES(profile,profile,
-**--with-profile          create code with profiling information,
+**--with-profile          create code with profiling information included,
 USE_PROFILE)
 
-AC_OVERRIDES(apple_ieee, apple_ieee,
-**--with_apple_ieee	  use the Apple IEEE codec,
-USE_APPLE_IEEE)
-
 dnl ----------------------------------------------------------------
-dnl user options for libraries
+dnl user options for libraries (no choice yet)
 dnl ----------------------------------------------------------------
 
 AC_OVERRIDES(zlib,zlib,
-**--with-zlib             use zlib for LZW comression,
+**--with-zlib             use zlib (LZW comression),
 USE_ZLIB)
 
 AC_OVERRIDES(gdk_imlib,gdk_imlib,
@@ -772,88 +762,28 @@ AC_OVERRIDES(libpng,libpng,
 USE_LIBPNG)
 
 AC_OVERRIDES(odbc,odbc,
-**--with-odbc             use iODBC and wxODBC classes,
+**--with-odbc           use iODBC,
 USE_ODBC)
 
 AC_OVERRIDES(opengl,opengl,
-**--with-opengl           use OpenGL (or Mesa),
+**--with-opengl           use opengl (OpenGL or Mesa),
 USE_OPENGL)
 
 dnl ----------------------------------------------------------------
-dnl user options for GUI control classes
+dnl user options for code features (no choice yet)
 dnl ----------------------------------------------------------------
 
-AC_OVERRIDES(gauge,gauge,
-**--with-gauge            use wxGauge class,
-USE_GAUGE)
+AC_OVERRIDES(apple_ieee, apple_ieee,
+**--with_apple_ieee	  use the Apple IEEE codec,
+USE_APPLE_IEEE)
 
-AC_OVERRIDES(scrollbar,scrollbar,
-**--with-scrollbar        use wxScrollbar class,
-USE_SCROLLBAR)
+AC_OVERRIDES(storable,storable,
+**--with-storable         use storable classes,
+USE_STORABLE_CLASSES)
 
-AC_OVERRIDES(listctrl,listctrl,
-**--with-listctrl         use wxListCtrl class,
-USE_LISTCTRL)
-
-AC_OVERRIDES(treectrl,treectrl,
-**--with-treectrl         use wxTreeCtrl class,
-USE_TREECTRL)
-
-AC_OVERRIDES(grid,grid,
-**--with-grid             use wxGrid class,
-USE_GRID)
-
-AC_OVERRIDES(tab_dialog,tab_dialog,
-**--with-tab_dialog       use wxTabDia class,
-USE_TAB_DIALOG)
-
-AC_OVERRIDES(notebook,notebook,
-**--with-notebook         use wxNotebook class,
-USE_NOTEBOOK)
-
-dnl ----------------------------------------------------------------
-dnl user options for non-GUI classes
-dnl ----------------------------------------------------------------
-
-AC_OVERRIDES(timedate, timedate,
-**--with-timedate         use wxTime and wxDate classes,
-USE_TIMEDATE)
-
-AC_OVERRIDES(fraction,fraction,
-**--with-fraction         use wxFraction class,
-USE_FRACTION)
-
-AC_OVERRIDES(log,log,
-**--with-log              use logging system,
-USE_LOG)
-
-AC_OVERRIDES(intl,intl,
-**--with-intl             use internationalization system,
-USE_INTL)
-
-AC_OVERRIDES(config,config,
-**--with-config           use wxConfig class,
-USE_CONFIG)
-
-AC_OVERRIDES(streams,streams,
-**--with-streams          use wxStream etc classes,
-USE_STREAMS)
-
-AC_OVERRIDES(serial,serial,
-**--with-serial           use class serialization,
-USE_SERIAL)
-
-AC_OVERRIDES(file,file,
-**--with-file             use wxFile class,
-USE_FILE)
-
-AC_OVERRIDES(textfile,textfile,
-**--with-textfile         use wxTextFile class,
-USE_TEXTFILE)
-
-dnl ----------------------------------------------------------------
-dnl user options for PostScript
-dnl ----------------------------------------------------------------
+AC_OVERRIDES(autotrans,autotrans,
+**--with-autotrans        use gettext automatic translation,
+USE_AUTOTRANS)
 
 AC_OVERRIDES(afmfonts,afmfonts,
 **--with-afmfonts         use Adobe Font Metric Font table,
@@ -863,57 +793,81 @@ AC_OVERRIDES(normalized, normalized,
 **--with-PS-normalized    use normalized PS fonts,
 WX_NORMALIZED_PS_FONTS)
 
-AC_OVERRIDES(postscript, postscript,
-**--with-postscript       use wxPostscriptDC device context,
-USE_POSTSCRIPT)
-
-dnl ----------------------------------------------------------------
-dnl user options for Prolog and Resources
-dnl ----------------------------------------------------------------
+AC_OVERRIDES(rpc,RPC,
+**--with-rpc              use RPC,
+USE_RPC)
 
 AC_OVERRIDES(wxresources,wxresources,
-**--with-wxresources      use wxWindows's resources,
+**--with-wxresources      use wxresources,
 USE_WX_RESOURCES)
 
 AC_OVERRIDES(prologio,prologio,
-**--with-prologio         use Prolog IO library,
+**--with-prologio         use prologio,
 USE_PROLOGIO)
 
-AC_OVERRIDES(rpc,RPC,
-**--with-rpc              use Prolog's remote procedure calls,
-USE_RPC)
+AC_OVERRIDES(postscript, postscript,
+**--with-postscript       use postscript-device-context,
+USE_POSTSCRIPT)
 
-dnl ----------------------------------------------------------------
-dnl user options for misc stuff
-dnl ----------------------------------------------------------------
+AC_OVERRIDES(wxconfig, wxconfig,
+**--with-wxconfig         use wxconfig,
+USE_WXCONFIG)
+
+AC_OVERRIDES(metafile, metafile,
+**--with-metafile         use metafile,
+USE_METAFILE)
+
+AC_OVERRIDES(form,form,
+**--with-form             use form,
+USE_FORM)
+
+AC_OVERRIDES(help,help,
+**--with-help             use help,
+USE_HELP)
 
 AC_OVERRIDES(ipc,IPC,
-**--with-ipc              use interprocess communication (wxSocket etc.),
+**--with-ipc              use ipc,
 USE_IPC)
 
+AC_OVERRIDES(enhanceddialog,enhanced dialog,
+**--with-enhanceddialog   use enhanced dialog,
+USE_ENHANCED_DIALOG)
+
 AC_OVERRIDES(resources,resources,
-**--with-resources        use X resources for saving information,
+**--with-resources        use resources,
 USE_RESOURCES)
 
 AC_OVERRIDES(clipboard,clipboard,
-**--with-clipboard        use wxClipboard classes,
+**--with-clipboard        use clipboard,
 USE_CLIPBOARD)
 
-AC_OVERRIDES(dnd,dnd,
-**--with-dnd              use Drag'n'Drop classes,
-USE_DND)
+AC_OVERRIDES(timedate, timedate,
+**--with-timedate         use timedate,
+USE_TIMEDATE)
+
+AC_OVERRIDES(fraction,fraction,
+**--with-fraction         use fraction,
+USE_FRACTION)
 
 AC_OVERRIDES(constraints,constrains,
-**--with-constraints      use layout-constraints system,
+**--with-constraints      use constraints,
 USE_CONSTRAINTS)
 
-dnl ----------------------------------------------------------------
-dnl user options for architectures
-dnl ----------------------------------------------------------------
+AC_OVERRIDES(toolbar,toolbar,
+**--with-toolbar          use toolbar,
+USE_TOOLBAR)
 
-AC_OVERRIDES(mdi,mdi,
-**--with-mdi              use multiple document interface architecture,
-USE_MDI_ARCHITECTURE)
+AC_OVERRIDES(gauge,gauge,
+**--with-gauge            use gauge,
+USE_GAUGE)
+
+AC_OVERRIDES(vllist,vllist,
+**--with-vlbox            use virtual list box,
+USE_VLBOX)
+
+AC_OVERRIDES(scrollbar,scrollbar,
+**--with-scrollbar        use scrollbar,
+USE_SCROLLBAR)
 
 AC_OVERRIDES(docview,docview,
 **--with-docview          use document view architecture,
@@ -923,28 +877,20 @@ AC_OVERRIDES(printarch,printarch,
 **--with-printarch        use printing architecture,
 USE_PRINTING_ARCHITECTURE)
 
-dnl ----------------------------------------------------------------
-dnl user options with no effect yet
-dnl ----------------------------------------------------------------
-dnl
-dnl AC_OVERRIDES(metafile, metafile,
-dnl **--with-metafile         use metafile (no effect),
-dnl USE_METAFILE)
-dnl
-dnl AC_OVERRIDES(help,help,
-dnl **--with-help             use help (no effect),
-dnl USE_HELP)
-dnl
-dnl AC_OVERRIDES(wxgraph,wxgraph,
-dnl **--with-wxgraph          use wxgraph (no effect),
-dnl USE_WXGRAPH)
-dnl
-dnl AC_OVERRIDES(wxtree,wxtree,
-dnl **--with-wxtree           use wxtree (no effect),
-dnl USE_WXTREE)
-dnl
+AC_OVERRIDES(typetree,typetree,
+**--with-typetree         use typetree,
+USE_TYPETREE)
+
+AC_OVERRIDES(wxgraph,wxgraph,
+**--with-wxgraph          use wxgraph,
+USE_WXGRAPH)
+
+AC_OVERRIDES(wxtree,wxtree,
+**--with-wxtree           use wxtree,
+USE_WXTREE)
+
 dnl AC_OVERRIDES(package,message,helpmessage,variable)
-dnl
+
 dnl ----------------------------------------------------------------
 dnl Unix, obviously
 dnl ----------------------------------------------------------------
@@ -1043,9 +989,47 @@ AC_SUBST(TOOLKIT_DEF)
 AC_SUBST(MAKEINCLUDE)
 
 dnl ----------------------------------------------------------------
-dnl Register compile options for makefiles and setup.h
+dnl register changes for Makefiles (via substit) and setup.h
 dnl ----------------------------------------------------------------
 
+ZLIB=NONE
+if test "$USE_ZLIB" = 1 ; then
+  ZLIB="ZLIB"
+fi
+
+GDK_IMLIB=NONE
+if test "$USE_GDK_IMLIB" = 1 ; then
+  GDK_IMLIB="GDK_IMLIB"
+fi
+
+LIBPNG=NONE
+if test "$USE_LIBPNG" = 1 ; then
+  LIBPNG="LIBPNG"
+fi
+
+ODBC=NONE
+if test "$USE_ODBC" = 1 ; then
+  ODBC="ODBC"
+fi
+
+APPLE_IEEE=NONE
+if test "$USE_APPLE_IEEE" = 1 ; then
+  APPLE_IEEE="APPLE_IEEE"
+  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
+fi
+
+STORABLE=NONE
+if test "$USE_STORABLE_CLASSES" = 1 ; then
+  STORABLE="STORABLE"
+  AC_DEFINE_UNQUOTED(USE_STORABLE_CLASSES,$USE_STORABLE_CLASSES)
+fi
+
+AUTOTRANS=NONE
+if test "$USE_AUTOTRANS" = 1 ; then
+  AUTOTRANS="AUTOTRANS"
+  AC_DEFINE_UNQUOTED(USE_AUTOTRANS,$USE_AUTOTRANS)
+fi
+
 WXDEBUG=
 if test "$USE_DEBUG_INFO" = 1 ; then
   WXDEBUG="-g -O0"
@@ -1093,179 +1077,44 @@ else
 fi
 AC_SUBST(OPTIMISE)
 
-APPLE_IEEE=NONE
-if test "$USE_APPLE_IEEE" = 1 ; then
-  APPLE_IEEE="APPLE_IEEE"
-  AC_DEFINE_UNQUOTED(USE_APPLE_IEEE,$USE_APPLE_IEEE)
-fi
-
 USE_IOSTREAMH=$DEFAULT_USE_IOSTREAMH
 AC_DEFINE_UNQUOTED(USE_IOSTREAMH,$USE_IOSTREAMH)
 
-dnl ----------------------------------------------------------------
-dnl Register library options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$USE_ZLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ZLIB,$USE_ZLIB)
-fi
-
-if test "$USE_GDK_IMLIB" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
-fi
-
-if test "$USE_LIBPNG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LIBPNG,$USE_LIBPNG) 
-fi
-
-if test "$USE_ODBC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
-fi
-
-dnl ----------------------------------------------------------------
-dnl Register GUI-control options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$USE_GAUGE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GAUGE,$USE_GAUGE)
-fi
-
-if test "$USE_SCROLLBAR" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
-fi
-
-if test "$USE_LISTCTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LISTCTRL,$USE_LISTCTRL)
-fi
-
-if test "$USE_TREECTRL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TREECTRL,$USE_TREECTRL)
-fi
-
-if test "$USE_GRID" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_GRID,$USE_GRID)
-fi
-
-if test "$USE_TAB_DIALOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TAB_DIALOG,$USE_TAB_DIALOG)
-fi
-
-if test "$USE_NOTEBOOK" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_NOTEBOOK,$USE_NOTEBOOK)
-fi
-
-dnl ----------------------------------------------------------------
-dnl Register non-GUI class options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$USE_CONFIG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CONFIG,$USE_CONFIG)
-fi
-
-if test "$USE_TIMEDATE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
-fi
-
-if test "$USE_FRACTION" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
-fi
-
-if test "$USE_LOG" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_LOG,$USE_LOG)
-fi
-
-if test "$USE_INTL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_INTL,$USE_INTL)
-fi
-
-if test "$USE_STREAMS" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_STREAMS,$USE_STREAMS)
-fi
-
-if test "$USE_SERIAL" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_SERIAL,$USE_SERIAL)
-fi
-
-if test "$USE_FILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_FILE,$USE_FILE)
-fi
-
-if test "$USE_TEXTFILE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_TEXTFILE,$USE_TEXTFILE)
-fi
-
-dnl ----------------------------------------------------------------
-dnl Register Prolog and Resources options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
+RPC=NONE
 if test "$USE_RPC" = 1 ; then
+  RPC="RPC"
   AC_DEFINE_UNQUOTED(USE_RPC,$USE_RPC)
 fi
+AC_SUBST(RPC)
 
+WXRESOURCES=NONE
 if test "$USE_WX_RESOURCES" = 1 ; then
+  WXRESOURCES="WXRESOURCES"
   AC_DEFINE_UNQUOTED(USE_WX_RESOURCES,$USE_WX_RESOURCES)
 fi
+AC_SUBST(WXRESOURCES)
 
+PROLOGIO=NONE
+PROLOGIOSRC=NONE
 if test "$USE_PROLOGIO" = 1 ; then
+  PROLOGIO="PROLOGIO"
+  PROLOGIOSRC="PROLOGIOSRC"
   AC_DEFINE_UNQUOTED(USE_PROLOGIO)
 fi
+AC_SUBST(PROLOGIO)
+AC_SUBST(PROLOGIOSRC)
 
-dnl ----------------------------------------------------------------
-dnl Register PostScript options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
+POSTSCRIPTDC=NONE
 if test "$USE_POSTSCRIPT" = 1 ; then
+  POSTSCRIPTDC="POSTSCRIPTDC"
   AC_DEFINE_UNQUOTED(USE_POSTSCRIPT)
 fi
+AC_SUBST(POSTSCRIPTDC)
 
-AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
-
-AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
-
-dnl ----------------------------------------------------------------
-dnl Register architecture options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$USE_MDI_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_MDI_ARCHITECTURE,$USE_MDI_ARCHITECTURE)
+if test "$USE_WXCONFIG" = 1 ; then
+  AC_DEFINE_UNQUOTED(USE_WXCONFIG,$USE_WXCONFIG)
 fi
 
-if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
-fi
-
-if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
-fi
-
-dnl ----------------------------------------------------------------
-dnl Register misc options for makefiles and setup.h
-dnl ----------------------------------------------------------------
-
-if test "$USE_IPC" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_IPC)
-fi
-
-if test "$USE_RESOURCES" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
-fi
-
-if test "$USE_CLIPBOARD" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
-fi
-
-if test "$USE_DND" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_DND,$USE_DND)
-fi
-
-if test "$USE_CONSTRAINTS" = 1 ; then
-  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
-fi
-
-dnl ----------------------------------------------------------------
-dnl No effect
-dnl ----------------------------------------------------------------
-
 METAFILE=NONE
 if test "$USE_METAFILE" = 1 ; then
   METAFILE="METAFILE"
@@ -1273,6 +1122,13 @@ if test "$USE_METAFILE" = 1 ; then
 fi
 AC_SUBST(METAFILE)
 
+FORM=NONE
+if test "$USE_FORM" = 1 ; then
+  FORM="FORM"
+  AC_DEFINE_UNQUOTED(USE_FORM,$USE_FORM)
+fi
+AC_SUBST(FORM)
+
 HELP=NONE
 if test "$USE_HELP" = 1 ; then
   HELP="HELP"
@@ -1280,6 +1136,105 @@ if test "$USE_HELP" = 1 ; then
 fi
 AC_SUBST(HELP)
 
+IPC=NONE
+if test "$USE_IPC" = 1 ; then
+  IPC="IPC"
+  AC_DEFINE_UNQUOTED(USE_IPC)
+fi
+AC_SUBST(IPC)
+
+ENHDIALOGBOX=NONE
+if test "$USE_ENHANCED_DIALOG" = 1 ; then
+  ENHDIALOGBOX="ENHDIALOGBOX"
+  AC_DEFINE_UNQUOTED(USE_ENHANCED_DIALOG,$USE_ENHANCED_DIALOG)
+fi
+AC_SUBST(ENHDIALOGBOX)
+
+XRESOURCES=NONE
+if test "$USE_RESOURCES" = 1 ; then
+  XRESOURCES="XRESOURCES"
+  AC_DEFINE_UNQUOTED(USE_RESOURCES,$USE_RESOURCES)
+fi
+AC_SUBST(XRESOURCES)
+
+CLIPBOARD=NONE
+if test "$USE_CLIPBOARD" = 1 ; then
+  CLIPBOARD="CLIPBOARD"
+  AC_DEFINE_UNQUOTED(USE_CLIPBOARD,$USE_CLIPBOARD)
+fi
+AC_SUBST(CLIPBOARD)
+
+CONSTRAINTS=NONE
+if test "$USE_CONSTRAINTS" = 1 ; then
+  CONSTRAINTS="CONSTRAINTS"
+  AC_DEFINE_UNQUOTED(USE_CONSTRAINTS,$USE_CONSTRAINTS)
+fi
+AC_SUBST(CONSTRAINTS)
+
+TIMEDATE=NONE
+if test "$USE_TIMEDATE" = 1 ; then
+  TIMEDATE="TIMEDATE"
+  AC_DEFINE_UNQUOTED(USE_TIMEDATE,$USE_TIMEDATE)
+fi
+AC_SUBST(TIMEDATE)
+
+FRACTION=NONE
+if test "$USE_FRACTION" = 1 ; then
+  FRACTION="FRACTION"
+  AC_DEFINE_UNQUOTED(USE_FRACTION,$USE_FRACTION)
+fi
+AC_SUBST(FRACTION)
+
+TOOLBAR=NONE
+if test "$USE_TOOLBAR" = 1 ; then
+  TOOLBAR="TOOLBAR"
+  AC_DEFINE_UNQUOTED(USE_TOOLBAR,$USE_TOOLBAR)
+  AC_DEFINE_UNQUOTED(USE_XT_TOOLBAR,$USE_XT_TOOLBAR)
+fi
+AC_SUBST(TOOLBAR)
+
+GAUGE=NONE
+if test "$USE_GAUGE" = 1 ; then
+  GAUGE="GAUGE"
+  AC_SUBST(GAUGE)
+  AC_DEFINE_UNQUOTED(USE_GAUGE,$USE_GAUGE)
+fi
+
+VIRLISTBOX=NONE
+if test "$USE_VLBOX" = 1 ; then
+  VIRTLISTBOX="VIRLISTBOX"
+  AC_DEFINE_UNQUOTED(USE_VIRLISTBOX,$USE_VIRLISTBOX)
+fi
+AC_SUBST(VIRLISTBOX)
+
+SCROLLBAR=NONE
+if test "$USE_SCROLLBAR" = 1 ; then
+  SCROLLBAR="SCROLLBAR"
+  AC_DEFINE_UNQUOTED(USE_SCROLLBAR,$USE_SCROLLBAR)
+fi
+AC_SUBST(SCROLLBAR)
+
+DOCVIEW=NONE
+if test "$USE_DOC_VIEW_ARCHITECTURE" = 1 ; then
+  DOCVIEW="DOCVIEW"
+  AC_DEFINE_UNQUOTED(USE_DOC_VIEW_ARCHITECTURE,$USE_DOC_VIEW_ARCHITECTURE)
+fi
+AC_SUBST(DOCVIEW)
+
+PRINTPREVIEW=NONE
+if test "$USE_PRINTING_ARCHITECTURE" = 1 ; then
+  PRINTPREVIEW="PRINTPREVIEW"
+  AC_DEFINE_UNQUOTED(USE_PRINTING_ARCHITECTURE,$USE_PRINTING_ARCHITECTURE)
+fi
+AC_SUBST(PRINTPREVIEW)
+
+TYPETREE=NONE
+if test "$USE_TYPETREE" = 1 ; then
+  TYPETREE="TYPETREE"
+  AC_DEFINE_UNQUOTED(USE_TYPETREE,$USE_TYPETREE)
+fi
+AC_SUBST(TYPETREE)
+
 WXGRAPH=NONE
 if test "$USE_WXGRAPH" = 1 ; then
   WXGRAPH="WXGRAPH"
@@ -1299,6 +1254,10 @@ if test "$USE_OPENGL" = 1 ; then
   GLCANVAS="GLCANVAS"
 fi
 
+AC_DEFINE_UNQUOTED(USE_AFM_FOR_POSTSCRIPT,$USE_AFM_FOR_POSTSCRIPT)
+
+AC_DEFINE_UNQUOTED(WX_NORMALIZED_PS_FONTS,$WX_NORMALIZED_PS_FONTS)
+
 dnl ----------------------------------------------------------------
 dnl select  dynamic loader (used by iODBC to load drivers)
 dnl ----------------------------------------------------------------
@@ -1316,7 +1275,7 @@ THREADS_LINK=""
 UNIX_THREAD=""
 
 AC_ARG_WITH(threads,
-[**--without-threads       Force disabling threads ],
+[  --without-threads       Force disabling threads ],
 [USE_THREADS="$withval"])
 
 if test "$USE_THREADS" = "1"; then
@@ -1405,6 +1364,125 @@ if test "$USE_OPENGL" = 1; then
   fi
 fi
 
+dnl ----------------------------------------------------------------
+dnl search for gdk_imlib
+dnl ----------------------------------------------------------------
+dnl 
+dnl GDK_IMLIB_INCLUDE=
+dnl GDK_IMLIB_LIBRARY=
+dnl GDK_IMLIB_LINK=
+dnl 
+    if test "$USE_GDK_IMLIB" = 1; then
+dnl   AC_MSG_CHECKING(for gdk_imlib includes)
+dnl   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,gdk_imlib.h)
+dnl   if test "$ac_find_includes" != "" ; then
+dnl     dnl GDK_IMLIB_INCLUDE="-I$ac_find_includes"
+dnl     AC_MSG_RESULT(found $ac_find_includes)
+dnl     AC_MSG_CHECKING(for gdk_imlib library)
+dnl     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,gdk_imlib)
+dnl     if test "$ac_find_libraries" != "" ; then
+dnl       AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
+dnl       AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+dnl       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+dnl       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+dnl       GDK_IMLIB_LIBRARY="$ac_path_to_link"
+dnl       GDK_IMLIB_INCLUDE="$ac_path_to_include"
+dnl       GDK_IMLIB_LINK="-lgdk_imlib"
+dnl       AC_MSG_RESULT(found gdk_imlib at $ac_find_libraries)
+dnl     else
+dnl       AC_MSG_ERROR(no)
+dnl     fi
+dnl   else
+dnl     AC_MSG_ERROR(no)
+dnl   fi
+      AC_DEFINE_UNQUOTED(USE_GDK_IMLIB,$USE_GDK_IMLIB)
+    fi
+dnl AC_SUBST(GDK_IMLIB_INCLUDE)
+dnl AC_SUBST(GDK_IMLIB_LIBRARY)
+dnl AC_SUBST(GDK_IMLIB_LINK)
+
+dnl ----------------------------------------------------------------
+dnl search for zlib
+dnl ----------------------------------------------------------------
+dnl
+dnl ZLIB_INCLUDE=
+dnl ZLIB_LINK=
+dnl 
+    if test "$USE_ZLIB" = 1; then
+dnl   AC_MSG_CHECKING(for zlib includes)
+dnl   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,zlib.h)
+dnl   if test "$ac_find_includes" != "" ; then
+dnl     AC_MSG_RESULT(found $ac_find_includes)
+dnl     AC_MSG_CHECKING(for zlib library)
+dnl     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,z)
+dnl     if test "$ac_find_libraries" != "" ; then
+dnl       AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
+dnl       AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+dnl       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+dnl       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+dnl       ZLIB_INCLUDE="$ac_path_to_include"
+dnl       ZLIB_LINK="-lz"
+dnl       AC_MSG_RESULT(found zlib at $ac_find_libraries)
+dnl     else
+dnl       AC_MSG_ERROR(no)
+dnl     fi
+dnl   else
+dnl     AC_MSG_ERROR(no)
+dnl   fi
+      AC_DEFINE_UNQUOTED(USE_ZLIB,$USE_ZLIB)
+    fi
+dnl AC_SUBST(ZLIB_INCLUDE)
+dnl AC_SUBST(ZLIB_LIBRARY)
+dnl AC_SUBST(ZLIB_LINK)
+
+dnl ----------------------------------------------------------------
+dnl search for libpng
+dnl ----------------------------------------------------------------
+dnl 
+dnl LIBPNG_INCLUDE=
+dnl LIBPNG_LIBRARY=
+dnl LIBPNG_LINK=
+dnl 
+    if test "$USE_LIBPNG" = 1; then
+dnl   AC_MSG_CHECKING(for libpng includes)
+dnl   AC_PATH_FIND_INCLUDES($SEARCH_INCLUDE,png.h)
+dnl   if test "$ac_find_includes" != "" ; then
+dnl     AC_MSG_RESULT(found $ac_find_includes)
+dnl     AC_MSG_CHECKING(for libpng library)
+dnl     AC_PATH_FIND_LIBRARIES($SEARCH_LIB,png)
+dnl     if test "$ac_find_libraries" != "" ; then
+dnl       AC_INCLUDE_PATH_EXIST($ac_find_includes,$CHECK_INCLUDE)
+dnl       AC_LINK_PATH_EXIST($ac_find_libraries,$CHECK_LIB)
+dnl       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
+dnl       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
+dnl       LIBPNG_LIBRARY="$ac_path_to_link"
+dnl       LIBPNG_INCLUDE="$ac_path_to_include"
+dnl       LIBPNG_LINK="-lpng"
+dnl       AC_MSG_RESULT(found libpng at $ac_find_libraries)
+dnl     else
+dnl       AC_MSG_RESULT(no)
+dnl     fi
+dnl   else
+dnl     AC_MSG_ERROR(no)
+dnl   fi
+      AC_DEFINE_UNQUOTED(USE_LIBPNG,$USE_LIBPNG) 
+    fi
+dnl AC_SUBST(LIBPNG_INCLUDE)
+dnl AC_SUBST(LIBPNG_LIBRARY)
+dnl AC_SUBST(LIBPNG_LINK)
+
+dnl ----------------------------------------------------------------
+dnl search for iODBC
+dnl ----------------------------------------------------------------
+dnl 
+    if test "$USE_ODBC" = 1; then
+      AC_DEFINE_UNQUOTED(USE_ODBC,$USE_ODBC) 
+    fi
+
+dnl ----------------------------------------------------------------
+dnl search for Python
+dnl ----------------------------------------------------------------
+
 dnl ----------------------------------------------------------------
 dnl left-over
 dnl ----------------------------------------------------------------
@@ -1545,8 +1623,9 @@ dnl ------------------------------------------------------------------------
 
 dnl add OS to list of configured
 echo $OS >> system.list
+echo $OS >> ../../system.list
 
 AC_CONFIG_HEADER(./setup/setup.h:./setup/setup.hin)
-AC_OUTPUT(./setup/substit,./setup/general/createall)
+AC_OUTPUT(./setup/substit,)
 
 AC_OVERRIDES_DONE

install/unix/install-sh

@@ -0,0 +1,250 @@
+#! /bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0

install/unix/setup/general/createall

@@ -55,19 +55,19 @@ ALL_DIR="$SRC_DIR $SAMPLES_DIR $UTILS_DIR $USER_DIR"
 echo Creating for: $OS
 
 # create defaults
-if test ! -d setup/$OS; then
-    mkdir setup/$OS
+if test ! -d install/unix/setup/$OS; then
+    mkdir install/unix/setup/$OS
 fi
 
-SUBSTFILE=setup/$OS/substit
+SUBSTFILE=install/unix/setup/$OS/substit
 
 # the substit file first
-if test -f setup/substit ; then
-  cat setup/substit | sed "s/*/@/g" > $SUBSTFILE;
-  rm -f setup/substit 
+if test -f install/unix/setup/substit ; then
+  cat install/unix/setup/substit | sed "s/*/@/g" > $SUBSTFILE;
+  rm -f install/unix/setup/substit 
 fi
 # now the template file
-cat setup/maketmpl.in | sed -f $SUBSTFILE > setup/$OS/maketmpl
+cat install/unix/setup/maketmpl.in | sed -f $SUBSTFILE > install/unix/setup/$OS/maketmpl
 
 # now the config header file
 #if test -f setup/wx_setup.h ; then

install/unix/setup/setup.hin

@@ -1,14 +1,18 @@
-/* setup.h
+/* wx_setup.h
+   This file is in the public domain.
 
-   Do not edit this file. It is autogenerated by configure.
+   Descriptive text for the C preprocessor macros that
+   the distributed Autoconf macros can define.
+   No software package will use all of them; autoheader copies the ones
+   your configure.in uses into your configuration header file templates.
+
+   The entries are in sort -df order: alphabetical, case insensitive,
+   ignoring punctuation (such as underscores).  Although this order
+   can split up related entries, it makes it easier to check whether
+   a given entry is in the file.
 
    Leave the following blank line there!!  Autoheader needs it.  */
 
-
-// ------------------------------------------------------------------------
-// Features as requested by configure
-// ------------------------------------------------------------------------
-
 #ifndef __GTKSETUPH__
 #define __GTKSETUPH__
 
@@ -38,10 +42,6 @@
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 
-//------------------------------------------------------------------------
-// library options
-//------------------------------------------------------------------------
-
 /*
  * Use zlib
  */
@@ -62,155 +62,48 @@
  * Use Threads
  */
 #undef USE_THREADS
-
-//------------------------------------------------------------------------
-// GUI control options
-//------------------------------------------------------------------------
-
 /*
- * Use gauge item
+ * Use storable classes
  */
-#undef USE_GAUGE
+#undef USE_STORABLE_CLASSES
 /*
- * Use scrollbar item
+ * Use automatic translation via gettext() in wxTString
  */
-#undef USE_SCROLLBAR
-/*
- * Use notebook item
- */
-#undef USE_NOTEBOOK
-/*
- * Use listctrl item
- */
-#undef USE_LISTCTRL
-/*
- * Use treectrl item
- */
-#undef USE_TREECTRL
-/*
- * Use grid item
- */
-#undef USE_GRID
-/*
- * Use tab dialog item
- */
-#undef USE_TAB_DIALOG
-
-//------------------------------------------------------------------------
-// non-GUI options
-//------------------------------------------------------------------------
-
-/*
- * Use fraction class
- */
-#undef USE_FRACTION
-/*
- * Use time and date classes
- */
-#undef USE_TIMEDATE
-/*
- * Use config system
- */
-#undef USE_CONFIG
-/*
- * Use intl system
- */
-#undef USE_INTL
-/*
- * Use streams
- */
-#undef USE_STREAMS
-/*
- * Use wxFile
- */
-#undef USE_FILE
-/*
- * Use wxTextFile
- */
-#undef USE_TEXTFILE
-/*
- * Use class serialization
- */
-#undef USE_SERIAL
-
-//------------------------------------------------------------------------
-// PS options
-//------------------------------------------------------------------------
-
+#undef USE_AUTOTRANS
 /*
  * Use font metric files in GetTextExtent for wxPostScriptDC
  * Use consistent PostScript fonts for AFM and printing (!)
  */
 #undef USE_AFM_FOR_POSTSCRIPT
 #undef WX_NORMALIZED_PS_FONTS
-/*
- * Use PostScript device context
- */
-#undef USE_POSTSCRIPT
-
-//------------------------------------------------------------------------
-// misc options
-//------------------------------------------------------------------------
-
-/*
- * Use Interprocess communication
- */
-#undef USE_IPC
-/*
- * Use wxGetResource & wxWriteResource (change .Xdefaults)
- */
-#undef USE_RESOURCES
 /*
  * Use clipboard
  */
 #undef USE_CLIPBOARD
-/*
- * Use dnd
- */
-#undef USE_DND
 /*
  * Use wxWindows layout constraint system
  */
 #undef USE_CONSTRAINTS
- 
-//------------------------------------------------------------------------
-// architecture options
-//------------------------------------------------------------------------
- 
-/*
- * Use the mdi architecture
- */
-#undef USE_MDI_ARCHITECTURE
 /*
  * Use the document/view architecture
  */
 #undef USE_DOC_VIEW_ARCHITECTURE
 /*
- * Use the print/preview architecture
+ * Use enhanced dialog
  */
-#undef USE_PRINTING_ARCHITECTURE
-
-//------------------------------------------------------------------------
-// Prolog and wxWindows' resource system options
-//------------------------------------------------------------------------
-
+#undef USE_ENHANCED_DIALOG
 /*
- * Use Prolog IO
+ * Use Form panel item placement
  */
-#undef USE_PROLOGIO
+#undef USE_FORM
 /*
- * Use Remote Procedure Call (Needs USE_IPC and USE_PROLOGIO)
+ * Use fraction class
  */
-#undef USE_RPC
+#undef USE_FRACTION
 /*
- * Use wxWindows resource loading (.wxr-files) (Needs USE_PROLOGIO 1)
+ * Use gauge item
  */
-#undef USE_WX_RESOURCES
-
-//------------------------------------------------------------------------
-// the rest
-//------------------------------------------------------------------------
-
+#undef USE_GAUGE
 /*
  * Implement a GLCanvas class as an interface to OpenGL, using the GLX
  * extension to the X11 protocol.  You can use the (free) Mesa library
@@ -225,10 +118,63 @@
  * Use iostream.h rather than iostream
  */
 #undef USE_IOSTREAMH
+/*
+ * Use Interprocess communication
+ */
+#undef USE_IPC
 /*
  * Use Metafile and Metafile device context
  */
 #undef USE_METAFILE
+/*
+ * Use PostScript device context
+ */
+#undef USE_POSTSCRIPT
+/*
+ * Use wxConfig system
+ */
+#undef USE_WXCONFIG
+/*
+ * Use the print/preview architecture
+ */
+#undef USE_PRINTING_ARCHITECTURE
+/*
+ * Use Prolog IO
+ */
+#undef USE_PROLOGIO
+/*
+ * Use Remote Procedure Call (Needs USE_IPC and USE_PROLOGIO)
+ */
+#undef USE_RPC
+/*
+ * Use wxGetResource & wxWriteResource (change .Xdefaults)
+ */
+#undef USE_RESOURCES
+/*
+ * Use scrollbar item
+ */
+#undef USE_SCROLLBAR
+/*
+ * Use time and date classes
+ */
+#undef USE_TIMEDATE
+/*
+ * Use toolbar, use Xt port toolbar (3D look)
+ */
+#undef USE_TOOLBAR
+#undef USE_XT_TOOLBAR
+/*
+ * Enables old type checking mechanism (wxSubType)
+ */
+#undef USE_TYPETREE
+/*
+ * Use virtual list box item
+ */
+#undef USE_VLBOX
+/*
+ * Use wxWindows resource loading (.wxr-files) (Needs USE_PROLOGIO 1)
+ */
+#undef USE_WX_RESOURCES
 /*
  * Use wxGraph
  */
@@ -236,11 +182,15 @@
 /*
  * Use wxTree
  */
-#undef USE_WXTREE
 /*
  * Use Apple Ieee-double converter
  */
 #undef USE_APPLE_IEEE
+
+/********************** DO NOT CHANGE BELOW THIS POINT **********************/
+
+/**************************** WXDEBUGGING FEATURES ****************************/
+
 /* Compatibility with 1.66 API.
    Level 0: no backward compatibility, all new features
    Level 1: wxDC, OnSize (etc.) compatibility, but
@@ -270,14 +220,9 @@
  * Matthews garbage collection (used for MrEd?)
  */
 #define WXGARBAGE_COLLECTION_ON 0
-/*
- * Use splines
- */
-#define USE_SPLINES 1
-/*
- * USE_DYNAMIC_CLASSES is TRUE for the Xt port
- */
-#define USE_DYNAMIC_CLASSES 1
+
+/**************************** COMPILER FEATURES *****************************/
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -294,9 +239,47 @@
  */
 #define CONST_COMPATIBILITY 0
 
-// ------------------------------------------------------------------------
-// System-specific stuff
-// ------------------------------------------------------------------------
+/************************ WINDOWS 3.1 COMPATIBILITY *************************/
+
+/*
+ * Normalize X drawing code to behave exactly as MSW.
+ */
+#define WX_STANDARD_GRAPHICS 0
+
+/******************* other stuff **********************************/
+/*
+ * Support image loading for wxBitmap (wxImage is needed for this)
+ */
+#define USE_IMAGE_LOADING 0
+#define WXIMAGE_INCLUDE "../../utils/image/src/wx_image.h"
+/*
+ * Use splines
+ */
+#define USE_SPLINES 1
+
+/*
+ * USE_DYNAMIC_CLASSES is TRUE for the Xt port
+ */
+#define USE_DYNAMIC_CLASSES 1
+/*
+ * USE_EXTENDED_STATICS is FALSE for the Xt port
+*/
+#define USE_EXTENDED_STATICS 0
+
+/*************************** IMAKEFILE EVALUATIOS ***************************/
+
+#if USE_XPM
+	#define USE_XPM_IN_X 1
+#else
+	#define USE_XPM_IN_X 0
+#endif
+#if USE_IMAGE_LOADING
+	#define USE_IMAGE_LOADING_IN_X 1
+#else
+	#define USE_IMAGE_LOADING_IN_X 0
+#endif
+
+/* here comes the system-specific stuff */
 
 /* acconfig.h
    This file is in the public domain.

install/unix/setup/substit.in

@@ -44,5 +44,33 @@ s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
 s|*THREADS*|@THREADS@|g
 s|*THREADS_LINK*|@THREADS_LINK@|g
 s|*EXTRA_LINK*|@EXTRA_LINK@|g
+s|*WXSTRING*|@WXSTRING@|g
+s|*TYPETREE*|@TYPETREE@|g
+s|*METAFILE*|@METAFILE@|g
+s|*POSTSCRIPTDC*|@POSTSCRIPTDC@|g
+s|*WXGRAPH*|@WXGRAPH@|g
+s|*WXTREE*|@WXTREE@|g
+s|*DOCVIEW*|@DOCVIEW@|g
+s|*FORM*|@FORM@|g
+s|*PRINTPREVIEW*|@PRINTPREVIEW@|g
+s|*IPC*|@IPC@|g
+s|*HELP*|@HELP@|g
+s|*CLIPBOARD*|@CLIPBOARD@|g
+s|*TIMEDATE*|@TIMEDATE@|g
+s|*FRACTION*|@FRACTION@|g
+s|*PROLOGIO*|@PROLOGIO@|g
+s|*PROLOGIOSRC*|@PROLOGIOSRC@|g
+s|*ENHDIALOGBOX*|@ENHDIALOGBOX@|g
+s|*GAUGE*|@GAUGE@|g
+s|*GLCANVAS*|@GLCANVAS@|g
+s|*LAYOUT*|@LAYOUT@|g
+s|*WXRESOURCES*|@WXRESOURCES@|g
+s|*XRESOURCES*|@XRESOURCES@|g
+s|*SCROLLBAR*|@SCROLLBAR@|g
+s|*STATICITEMS*|@STATICITEMS@|g
+s|*TOOLBAR*|@TOOLBAR@|g
+s|*CONSTRAINTS*|@CONSTRAINTS@|g
+s|*RPC*|@RPC@|g
+s|*VIRLISTBOX*|@VIRLISTBOX@|g
 s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
 s|*UNIX_THREAD*|@UNIX_THREAD@|g

samples/Makefile

@@ -1 +1 @@
-include ../setup/general/makedirs
+include ../install/unix/setup/general/makedirs

samples/config/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/controls/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/dialogs/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/dnd/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/docview/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/docvwmdi/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/dynamic/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/dynamic/minimal.cpp

@@ -0,0 +1,113 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        minimal.cpp
+// Purpose:     Dynamic events wxWindows sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:   	wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "minimal.cpp"
+#pragma interface "minimal.cpp"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+#ifdef __WXGTK__
+#include "mondrian.xpm"
+#endif
+
+// Define a new application type
+class MyApp: public wxApp
+{ public:
+    bool OnInit(void);
+};
+
+// Define a new frame type
+class MyFrame: public wxFrame
+{ public:
+    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+    
+ public:
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+	bool OnClose(void) { return TRUE; }
+};
+
+// ID for the menu commands
+#define MINIMAL_QUIT 	1
+#define MINIMAL_TEXT 	101
+#define MINIMAL_ABOUT 	102
+
+// Create a new application object
+IMPLEMENT_APP	(MyApp)
+
+// `Main program' equivalent, creating windows and returning main app frame
+bool MyApp::OnInit(void)
+{
+  // Create the main frame window
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "Minimal wxWindows App", 50, 50, 450, 340);
+  
+  frame->Connect( MINIMAL_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnQuit );
+  frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
+  
+  // Give it an icon
+#ifdef __WXMSW__
+  frame->SetIcon(wxIcon("mondrian"));
+#else
+  frame->SetIcon(wxIcon(mondrian_xpm));
+#endif
+
+  // Make a menubar
+  wxMenu *file_menu = new wxMenu;
+
+  file_menu->Append(MINIMAL_ABOUT, "&About");
+  file_menu->Append(MINIMAL_QUIT, "E&xit");
+  wxMenuBar *menu_bar = new wxMenuBar;
+  menu_bar->Append(file_menu, "&File");
+  frame->SetMenuBar(menu_bar);
+
+  // Make a panel with a message
+  wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
+
+  (void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
+
+  // Show the frame
+  frame->Show(TRUE);
+  
+  SetTopWindow(frame);
+
+  return TRUE;
+}
+
+// My frame constructor
+MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
+  wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+{}
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
+{
+  Close(TRUE);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
+{
+  wxMessageDialog dialog(this, "This is a minimal sample\nA second line in the message box",
+  	"About Minimal", wxYES_NO|wxCANCEL);
+
+  dialog.ShowModal();
+}
+
+

samples/forty/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/grid/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/internat/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/layout/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/listctrl/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/mdi/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/memcheck/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/minimal/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/png/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/printing/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/resource/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/splitter/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/tab/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/thread/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/toolbar/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/treectrl/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

samples/validate/Makefile

@@ -1 +1 @@
-include ../../setup/general/makeapp
+include ../../install/unix/setup/general/makeapp

src/Makefile

@@ -1 +1 @@
-include ../setup/general/makeapp
+include ../install/unix/setup/general/makeapp

src/common/object.cpp

@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
@@ -53,7 +53,7 @@ wxHashTable wxClassInfo::classTable(wxKEY_STRING);
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
@@ -61,7 +61,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
 	UnRef();
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
 	if (m_serialObj)
 	  delete m_serialObj;
 #endif
@@ -228,7 +228,7 @@ wxObject *wxCreateDynamicObject(char *name)
   return info->CreateObject();
 }
 
-#ifdef USE_SERIAL
+#ifdef USE_STORABLE_CLASSES
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"

src/gtk.inc

@@ -54,7 +54,6 @@ LIB_CPP_SRC=\
  common/valtext.cpp \
  common/wxexpr.cpp \
 \
- gtk/accel.cpp \
  gtk/app.cpp \
  gtk/bitmap.cpp \
  gtk/bmpbuttn.cpp \

src/gtk/accel.cpp

@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        accel.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "accel.h"
-#endif
-
-#include "wx/accel.h"
-
-//-----------------------------------------------------------------------------
-// wxAcceleratorTable
-//-----------------------------------------------------------------------------
-
-class wxAccelRefData: public wxObjectRefData
-{
-  public:
-  
-    wxAccelRefData(void);
-  
-    wxList m_accels;
-};
-
-wxAccelRefData::wxAccelRefData(void)
-{
-  m_accels.DeleteContents( TRUE );
-}
-
-//-----------------------------------------------------------------------------
-
-#define M_ACCELDATA ((wxAccelRefData *)m_refData)
-
-IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)
-  
-wxAcceleratorTable::wxAcceleratorTable()
-{
-  m_refData = new wxAccelRefData();
-}
-
-wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
-{
-  m_refData = new wxAccelRefData();
-  for (int i = 0; i < n; i++)
-  {
-    M_ACCELDATA->m_accels.Append( (wxObject*)
-      new wxAcceleratorEntry( entries[n].GetFlags(), entries[n].GetKeyCode(), entries[n].GetCommand() ) );
-  }
-}
-
-wxAcceleratorTable::~wxAcceleratorTable()
-{
-}
-
-bool wxAcceleratorTable::Ok() const
-{
-  return (m_refData != NULL);
-}
-
-int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
-{
-  wxNode *node = M_ACCELDATA->m_accels.First();
-  while (node)
-  {
-    wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->Data();
-    if ((event.m_keyCode == entry->GetKeyCode()) &&
-        (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
-        (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
-        (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
-      return entry->GetCommand();
-    node = node->Next();
-  }
-  
-  return -1;
-}
-