This commit was manufactured by cvs2svn to create tag

'OLD_DATE_AND_TIME'.

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

include/wx/date.h

@@ -0,0 +1,146 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        date.h
+// Purpose:     wxDate class
+// Author:      Julian Smart, Steve Marcus, Eric Simon, Chris Hill,
+//              Charles D. Price
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c)
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DATE_H_
+#define _WX_DATE_H_
+
+#ifdef __GNUG__
+#pragma interface "date.h"
+#endif
+
+#include "wx/object.h"
+#include "wx/string.h"
+
+#if wxUSE_TIMEDATE
+// These lines necessary to stop VC++ 6 being confused about namespaces
+class WXDLLEXPORT wxDate;
+bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator<(const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
+bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
+
+enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
+
+#define wxNO_CENTURY  0x02
+#define wxDATE_ABBR   0x04
+
+class WXDLLEXPORT wxDate : public wxObject
+{
+DECLARE_DYNAMIC_CLASS(wxDate)
+
+protected:
+    unsigned long julian; // see julDate();  days since 1/1/4713 B.C.
+    int month;            // see NMonth()
+    int day;              // see Day()
+    int year;             // see NYear4()
+    int day_of_week;      // see NDOW();  1 = Sunday, ... 7 = Saturday
+
+private:
+    int       DisplayFormat;
+    unsigned char DisplayOptions;
+
+    void julian_to_mdy ();         // convert julian day to mdy
+    void julian_to_wday ();        // convert julian day to day_of_week
+    void mdy_to_julian ();         // convert mdy to julian day
+
+public:
+    wxDate ();
+    wxDate (long j);
+    wxDate (int m, int d, int y);
+    wxDate (const wxString& dat);
+    wxDate (const wxDate &dt);
+
+#ifndef __SALFORDC__
+    operator wxString  (void);
+#endif
+
+    void operator =   (const wxDate& date);
+    void operator =   (const wxString& date);
+
+    wxDate operator +  (long i);
+    wxDate operator +  (int  i);
+
+    wxDate operator -  (long i);
+    wxDate operator -  (int  i);
+
+    long operator -  (const wxDate &dt);
+
+    wxDate &operator += (long i);
+    wxDate &operator -= (long i);
+
+    wxDate &operator ++ ();     // Prefix increment
+    wxDate &operator ++ (int);  // Postfix increment
+    wxDate &operator -- ();     // Prefix decrement
+    wxDate &operator -- (int);  // Postfix decrement
+
+    friend bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2);
+    friend bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2);
+    friend bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2);
+    friend bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2);
+    friend bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2);
+    friend bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2);
+
+#if wxUSE_STD_IOSTREAM
+    friend ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt);
+#endif
+
+    wxString FormatDate      (int type=-1) const;
+    void  SetFormat (int format);
+    int   SetOption (int option, bool enable=TRUE);
+
+    long  GetJulianDate() const;  // returns julian date
+    int   GetDayOfYear()  const;  // returns relative date since Jan. 1
+    bool  IsLeapYear()    const;  // returns TRUE if leap year, FALSE if not
+
+    // Version 4.0 Extension to Public Interface - CDP
+
+    // These 'Set's modify the date object and actually SET it
+    // They all return a reference to self (*this)
+
+    wxDate &Set();            // Sets to current system date
+    wxDate &Set(long lJulian);
+    wxDate &Set(int nMonth, int nDay, int nYear);
+
+    wxDate &AddWeeks(int nCount = 1);  //
+    wxDate &AddMonths(int nCount = 1); // May also pass neg# to decrement
+    wxDate &AddYears(int nCount = 1);  //
+
+    int   GetDay() const;      // Numeric Day of date object
+    int   GetDaysInMonth();    // Number of days in month (1..31)
+    int   GetFirstDayOfMonth() const; // First Day Of Month  (1..7)
+
+    wxString GetDayOfWeekName();       // Character Day Of Week ('Sunday'..'Saturday')
+    int   GetDayOfWeek() const;     // (1..7)
+
+    int   GetWeekOfMonth();            // Numeric Week Of Month  (1..6)
+    int   GetWeekOfYear();            // Numeric Week Of Year   (1..52)
+
+    wxString GetMonthName();            // Character Month name
+    int   GetMonth() const;          // Month Number (1..12)
+    wxDate  GetMonthStart();         // First Date Of Month
+    wxDate  GetMonthEnd();           // Last Date Of Month
+
+    int   GetYear() const;           // eg. 1992
+    wxDate  GetYearStart();          // First Date Of Year
+    wxDate  GetYearEnd();            // Last Date Of Year
+
+    bool IsBetween(const wxDate& first, const wxDate& second) const;
+
+    wxDate Previous(int dayOfWeek) const;
+};
+
+#endif // wxUSE_TIMEDATE
+#endif
+    // _WX_DATE_H_

include/wx/gtk/window.h

@@ -1,242 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/window.h
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __GTKWINDOWH__
-#define __GTKWINDOWH__
-
-#ifdef __GNUG__
-    #pragma interface
-#endif
-
-//-----------------------------------------------------------------------------
-// callback definition for inserting a window (internal)
-//-----------------------------------------------------------------------------
-
-class wxWindowGTK;
-typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* );
-
-//-----------------------------------------------------------------------------
-// wxWindowGTK
-//-----------------------------------------------------------------------------
-
-class wxWindowGTK : public wxWindowBase
-{
-public:
-    // creating the window
-    // -------------------
-    wxWindowGTK();
-    wxWindowGTK(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    virtual ~wxWindowGTK();
-
-    // implement base class (pure) virtual methods
-    // -------------------------------------------
-
-    virtual bool Destroy();
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show( bool show = TRUE );
-    virtual bool Enable( bool enable = TRUE );
-
-    virtual bool IsRetained() const;
-
-    virtual void SetFocus();
-    virtual bool AcceptsFocus() const;
-
-    virtual bool Reparent( wxWindowBase *newParent );
-
-    virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
-
-    virtual void Refresh( bool eraseBackground = TRUE,
-                          const wxRect *rect = (const wxRect *) NULL );
-    virtual void Clear();
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-    virtual void GetTextExtent(const wxString& string,
-                               int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
-                               const wxFont *theFont = (const wxFont *) NULL)
-                               const;
-
-#if wxUSE_MENUS_NATIVE
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif // wxUSE_MENUS_NATIVE
-
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-                               int range, bool refresh = TRUE );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL );
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
-
-    // implementation
-    // --------------
-
-    virtual WXWidget GetHandle() const { return m_widget; }
-
-    /* I don't want users to override what's done in idle so everything that
-       has to be done in idle time in order for wxGTK to work is done in
-       OnInternalIdle */
-    virtual void OnInternalIdle();
-
-    /* For compatibility across platforms (not in event table) */
-    void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
-
-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
-
-    /* used by all window classes in the widget creation process */
-    bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );
-    void PostCreation();
-
-    /* internal addition of child windows. differs from class
-       to class not by using virtual functions but by using
-       the m_insertCallback */
-    void DoAddChild(wxWindowGTK *child);
-
-    /* the methods below are required because many native widgets
-       are composed of several subwidgets and setting a style for
-       the widget means setting it for all subwidgets as well.
-       also, it is nor clear, which native widget is the top
-       widget where (most of) the input goes. even tooltips have
-       to be applied to all subwidgets. */
-
-    virtual GtkWidget* GetConnectWidget();
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
-    void ConnectWidget( GtkWidget *widget );
-
-    /* creates a new widget style if none is there
-       and sets m_widgetStyle to this value. */
-    GtkStyle *GetWidgetStyle();
-
-    /* called by SetFont() and SetXXXColour etc */
-    void SetWidgetStyle();
-
-    /* overridden in many GTK widgets */
-    virtual void ApplyWidgetStyle();
-
-#if wxUSE_TOOLTIPS
-    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // called from GTK signales handlers. it indicates that
-    // the layouting functions have to be called later on
-    // (i.e. in idle time, implemented in OnInternalIdle() ).
-    void GtkUpdateSize() { m_sizeSet = FALSE; }
-
-    // position and size of the window
-    int                  m_x, m_y;
-    int                  m_width, m_height;
-    int                  m_oldClientWidth,m_oldClientHeight;
-
-    /* see the docs in src/gtk/window.cpp */
-    GtkWidget           *m_widget;
-    GtkWidget           *m_wxwindow;
-
-#if HAVE_XIM
-    /* XIM support for wxWindows */
-    GdkIC               *m_ic;
-    GdkICAttr           *m_icattr;
-#endif
-
-    /* scrolling stuff */
-    GtkAdjustment       *m_hAdjust,*m_vAdjust;
-    float                m_oldHorizontalPos;
-    float                m_oldVerticalPos;
-
-    // extra (wxGTK-specific) flags
-    bool                 m_needParent:1;        /* ! wxFrame, wxDialog, wxNotebookPage ?  */
-    bool                 m_noExpose:1;          /* wxGLCanvas has its own redrawing */
-    bool                 m_nativeSizeEvent:1;   /* wxGLCanvas sends wxSizeEvent upon "alloc_size" */
-    bool                 m_hasScrolling:1;
-    bool                 m_hasVMT:1;
-    bool                 m_sizeSet:1;
-    bool                 m_resizing:1;
-    bool                 m_isStaticBox:1;    /* faster than IS_KIND_OF */
-    bool                 m_isRadioButton:1;  /* faster than IS_KIND_OF */
-    bool                 m_isFrame:1;        /* faster than IS_KIND_OF */
-    bool                 m_acceptsFocus:1;   /* not wxStaticBox, not wxStaticBitmap etc.  */
-    bool                 m_isScrolling;
-    bool                 m_clipPaintRegion;  /* TRUE after ScrollWindow() */
-    bool                 m_queuedFullRedraw; /* TRUE after DoMoveWindow */
-
-    // these are true if the style were set before the widget was realized
-    // (typcally in the constructor) but the actual GTK style must not be set
-    // before the widget has been "realized"
-    bool                 m_delayedForegroundColour:1;
-    bool                 m_delayedBackgroundColour:1;
-
-    // contains GTK's widgets internal information about non-default widget
-    // font and colours. we create one for each widget that gets any
-    // non-default attribute set via SetFont() or SetForegroundColour() /
-    // SetBackgroundColour().
-    GtkStyle            *m_widgetStyle;
-
-    // C++ has no virtual methods in the constrcutor of any class but we need
-    // different methods of inserting a child window into a wxFrame,
-    // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
-    wxInsertChildFunction  m_insertCallback;
-
-    // implement the base class pure virtuals
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // common part of all ctors (can't be virtual because called from ctor)
-    void Init();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
-};
-
-extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);
-
-#endif // __GTKWINDOWH__

include/wx/gtk1/window.h

@@ -1,242 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gtk/window.h
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __GTKWINDOWH__
-#define __GTKWINDOWH__
-
-#ifdef __GNUG__
-    #pragma interface
-#endif
-
-//-----------------------------------------------------------------------------
-// callback definition for inserting a window (internal)
-//-----------------------------------------------------------------------------
-
-class wxWindowGTK;
-typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* );
-
-//-----------------------------------------------------------------------------
-// wxWindowGTK
-//-----------------------------------------------------------------------------
-
-class wxWindowGTK : public wxWindowBase
-{
-public:
-    // creating the window
-    // -------------------
-    wxWindowGTK();
-    wxWindowGTK(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-    virtual ~wxWindowGTK();
-
-    // implement base class (pure) virtual methods
-    // -------------------------------------------
-
-    virtual bool Destroy();
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show( bool show = TRUE );
-    virtual bool Enable( bool enable = TRUE );
-
-    virtual bool IsRetained() const;
-
-    virtual void SetFocus();
-    virtual bool AcceptsFocus() const;
-
-    virtual bool Reparent( wxWindowBase *newParent );
-
-    virtual void WarpPointer(int x, int y);
-    virtual void CaptureMouse();
-    virtual void ReleaseMouse();
-
-    virtual void Refresh( bool eraseBackground = TRUE,
-                          const wxRect *rect = (const wxRect *) NULL );
-    virtual void Clear();
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-    virtual void GetTextExtent(const wxString& string,
-                               int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
-                               const wxFont *theFont = (const wxFont *) NULL)
-                               const;
-
-#if wxUSE_MENUS_NATIVE
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif // wxUSE_MENUS_NATIVE
-
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-                               int range, bool refresh = TRUE );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = (wxRect *) NULL );
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
-
-    // implementation
-    // --------------
-
-    virtual WXWidget GetHandle() const { return m_widget; }
-
-    /* I don't want users to override what's done in idle so everything that
-       has to be done in idle time in order for wxGTK to work is done in
-       OnInternalIdle */
-    virtual void OnInternalIdle();
-
-    /* For compatibility across platforms (not in event table) */
-    void OnIdle(wxIdleEvent& WXUNUSED(event)) {};
-
-    // wxGTK-specific: called recursively by Enable,
-    // to give widgets an oppprtunity to correct their colours after they
-    // have been changed by Enable
-    virtual void OnParentEnable( bool WXUNUSED(enable) ) {};
-
-    /* used by all window classes in the widget creation process */
-    bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size );
-    void PostCreation();
-
-    /* internal addition of child windows. differs from class
-       to class not by using virtual functions but by using
-       the m_insertCallback */
-    void DoAddChild(wxWindowGTK *child);
-
-    /* the methods below are required because many native widgets
-       are composed of several subwidgets and setting a style for
-       the widget means setting it for all subwidgets as well.
-       also, it is nor clear, which native widget is the top
-       widget where (most of) the input goes. even tooltips have
-       to be applied to all subwidgets. */
-
-    virtual GtkWidget* GetConnectWidget();
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
-    void ConnectWidget( GtkWidget *widget );
-
-    /* creates a new widget style if none is there
-       and sets m_widgetStyle to this value. */
-    GtkStyle *GetWidgetStyle();
-
-    /* called by SetFont() and SetXXXColour etc */
-    void SetWidgetStyle();
-
-    /* overridden in many GTK widgets */
-    virtual void ApplyWidgetStyle();
-
-#if wxUSE_TOOLTIPS
-    virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // called from GTK signales handlers. it indicates that
-    // the layouting functions have to be called later on
-    // (i.e. in idle time, implemented in OnInternalIdle() ).
-    void GtkUpdateSize() { m_sizeSet = FALSE; }
-
-    // position and size of the window
-    int                  m_x, m_y;
-    int                  m_width, m_height;
-    int                  m_oldClientWidth,m_oldClientHeight;
-
-    /* see the docs in src/gtk/window.cpp */
-    GtkWidget           *m_widget;
-    GtkWidget           *m_wxwindow;
-
-#if HAVE_XIM
-    /* XIM support for wxWindows */
-    GdkIC               *m_ic;
-    GdkICAttr           *m_icattr;
-#endif
-
-    /* scrolling stuff */
-    GtkAdjustment       *m_hAdjust,*m_vAdjust;
-    float                m_oldHorizontalPos;
-    float                m_oldVerticalPos;
-
-    // extra (wxGTK-specific) flags
-    bool                 m_needParent:1;        /* ! wxFrame, wxDialog, wxNotebookPage ?  */
-    bool                 m_noExpose:1;          /* wxGLCanvas has its own redrawing */
-    bool                 m_nativeSizeEvent:1;   /* wxGLCanvas sends wxSizeEvent upon "alloc_size" */
-    bool                 m_hasScrolling:1;
-    bool                 m_hasVMT:1;
-    bool                 m_sizeSet:1;
-    bool                 m_resizing:1;
-    bool                 m_isStaticBox:1;    /* faster than IS_KIND_OF */
-    bool                 m_isRadioButton:1;  /* faster than IS_KIND_OF */
-    bool                 m_isFrame:1;        /* faster than IS_KIND_OF */
-    bool                 m_acceptsFocus:1;   /* not wxStaticBox, not wxStaticBitmap etc.  */
-    bool                 m_isScrolling;
-    bool                 m_clipPaintRegion;  /* TRUE after ScrollWindow() */
-    bool                 m_queuedFullRedraw; /* TRUE after DoMoveWindow */
-
-    // these are true if the style were set before the widget was realized
-    // (typcally in the constructor) but the actual GTK style must not be set
-    // before the widget has been "realized"
-    bool                 m_delayedForegroundColour:1;
-    bool                 m_delayedBackgroundColour:1;
-
-    // contains GTK's widgets internal information about non-default widget
-    // font and colours. we create one for each widget that gets any
-    // non-default attribute set via SetFont() or SetForegroundColour() /
-    // SetBackgroundColour().
-    GtkStyle            *m_widgetStyle;
-
-    // C++ has no virtual methods in the constrcutor of any class but we need
-    // different methods of inserting a child window into a wxFrame,
-    // wxMDIFrame, wxNotebook etc. this is the callback that will get used.
-    wxInsertChildFunction  m_insertCallback;
-
-    // implement the base class pure virtuals
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // common part of all ctors (can't be virtual because called from ctor)
-    void Init();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxWindowGTK)
-    DECLARE_NO_COPY_CLASS(wxWindowGTK)
-};
-
-extern wxWindow *wxFindFocusedChild(wxWindowGTK *win);
-
-#endif // __GTKWINDOWH__

include/wx/time.h

@@ -0,0 +1,112 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        time.h
+// Purpose:     wxTime class, from NIHCL
+// Author:      Julian Smart, after K. E. Gorlen
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TIMEH__
+#define _WX_TIMEH__
+
+#include "wx/object.h"
+
+#if wxUSE_TIMEDATE
+
+#ifdef __GNUG__
+#pragma interface "time.h"
+#endif
+
+class WXDLLEXPORT wxDate;
+
+typedef unsigned short hourTy;
+typedef unsigned short minuteTy;
+typedef unsigned short secondTy;
+typedef unsigned long clockTy;
+
+class WXDLLEXPORT wxTime: public wxObject
+{
+        DECLARE_DYNAMIC_CLASS(wxTime)
+        
+public:                 // type definitions
+    enum tFormat { wx12h, wx24h };
+    enum tPrecision { wxStdMinSec, wxStdMin };
+private:
+    static tFormat      Format;
+    static tPrecision   Precision;
+
+    clockTy    sec;        /* seconds since 1/1/1901 */
+
+    bool IsDST() const;
+    wxTime GetLocalTime() const;
+private:        // static member functions
+    static wxTime GetLocalTime(const wxDate& date, hourTy h=0, minuteTy m=0, secondTy s=0);
+    static wxTime GetBeginDST(unsigned year);
+    static wxTime GetEndDST(unsigned year);
+public:
+    wxTime();             // current time 
+    wxTime(clockTy s)         { sec = s; }
+    void operator=(const wxTime& t)     { sec = t.sec; } // Ordering required for some compilers
+    wxTime(const wxTime& t)         { (*this) = t ; }
+    wxTime(hourTy h, minuteTy m, secondTy s =0, bool dst =FALSE);
+    wxTime(const wxDate&, hourTy h =0, minuteTy m =0, secondTy s=0, bool dst =FALSE);
+
+    // Convert to string
+#ifndef __SALFORDC__
+    operator wxChar * (void);
+    operator wxDate() const;
+#endif
+
+    bool operator<(const wxTime& t) const     { return sec < t.sec; }
+    bool operator<=(const wxTime& t) const    { return sec <= t.sec; }
+    bool operator>(const wxTime& t) const     { return sec > t.sec; }
+    bool operator>=(const wxTime& t) const    { return sec >= t.sec; }
+    bool operator==(const wxTime& t) const    { return sec == t.sec; }
+    bool operator!=(const wxTime& t) const    { return sec != t.sec; }
+    friend wxTime operator+(const wxTime& t, long s)    { return wxTime(t.sec+s); }
+    friend wxTime operator+(long s, const wxTime& t)    { return wxTime(t.sec+s); }
+    long operator-(const wxTime& t) const     { return sec - t.sec; }
+    wxTime operator-(long s) const    { return wxTime(sec-s); }
+    void operator+=(long s)     { sec += s; }
+    void operator-=(long s)     { sec -= s; }
+    bool IsBetween(const wxTime& a, const wxTime& b) const;
+
+    /// Get day
+    int GetDay() const;
+    /// Get month
+    int GetMonth() const;
+    /// Get year
+    int GetYear() const;
+    /// Get day of week (0=Sunday 6=Saturday)
+    int GetDayOfWeek() const;
+
+    hourTy GetHour() const;        // hour in local time
+    hourTy GetHourGMT() const;     // hour in GMT
+    minuteTy GetMinute() const;    // minute in local time
+    minuteTy GetMinuteGMT() const;     // minute in GMT
+    secondTy GetSecond() const;    // second in local time or GMT
+    clockTy GetSeconds() const     { return sec; }
+    secondTy GetSecondGMT() const ;
+    wxTime Max(const wxTime&) const;
+    wxTime Min(const wxTime&) const;
+    static void SetFormat(const tFormat lFormat = wx12h,
+                  const tPrecision lPrecision = wxStdMinSec);
+    wxChar *FormatTime() const;
+/*
+    virtual int compare(const Object&) const;
+    virtual void deepenShallowCopy();       // {}
+    virtual unsigned hash() const;
+    virtual bool isEqual(const Object&) const;
+    virtual void printOn(ostream& strm =cout) const;
+    virtual const Class* species() const;
+*/
+};
+
+#endif
+  // wxUSE_TIMEDATE
+#endif
+    // _WX_TIMEH__
+

src/common/date.cpp

@@ -0,0 +1,656 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        date.cpp
+// Purpose:     wxDate class
+// Author:
+//    Originally inspired by Steve Marcus (CIS 72007,1233)  6/16/91
+//    Enhanced by Eric Simon (CIS 70540,1522)               6/29/91
+//    Further Enhanced by Chris Hill (CIS 72030,2606)       7/11/91
+//    Still Further Enhanced by Hill & Simon  v3.10         8/05/91
+//    Version 4 by Charles D. Price                         6/27/92
+//    Integrated into wxWindows by Julian Smart             9th July 1995
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "date.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_TIMEDATE
+
+#include "wx/date.h"
+#include "wx/intl.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "wx/ioswrap.h"
+
+#include <time.h>
+#include <string.h>
+
+#define ABBR_LENGTH 3
+
+static const wxChar *dayname[] = {
+    wxT("Sunday"), wxT("Monday"), wxT("Tuesday"), wxT("Wednesday"),
+    wxT("Thursday"), wxT("Friday"), wxT("Saturday")
+};
+
+static const wxChar *mname[] = {
+    wxT("January"), wxT("February"), wxT("March"), wxT("April"), wxT("May"), wxT("June"),
+    wxT("July"), wxT("August"), wxT("September"), wxT("October"), wxT("November"), wxT("December")
+};
+
+static int GauDays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
+
+    ////////////////////////////////////////////////////////////
+    // Constructors
+    ////////////////////////////////////////////////////////////
+
+wxDate::wxDate()
+{
+    DisplayFormat=wxMDY;
+    DisplayOptions='\0';
+    month = day = year = day_of_week = 0;
+    julian = 0;
+}
+
+wxDate::wxDate (long j) : julian(j)
+{
+    DisplayFormat=wxMDY;
+    DisplayOptions='\0';
+    julian_to_mdy ();
+}
+
+wxDate::wxDate (int m, int d, int y) : month(m), day(d), year(y)
+{
+    DisplayFormat=wxMDY;
+    DisplayOptions='\0';
+    mdy_to_julian ();
+}
+
+wxDate::wxDate (const wxString& dat)
+{
+    DisplayFormat=wxMDY;
+    DisplayOptions='\0';
+    if (wxStrcmp(dat, wxT("TODAY")) == 0 || wxStrcmp(dat, wxT("today")) == 0)
+    {
+        // Sets the current date
+        Set();
+    }
+    else
+    {
+        wxChar buf[100];
+        wxStrcpy(buf, dat);
+
+        wxChar *save_ptr, *token = wxStrtok(buf,wxT("/-"),&save_ptr);
+        month = wxAtoi(token);
+        day   = wxAtoi(wxStrtok((wxChar *) NULL,wxT("/-"),&save_ptr));
+        year  = wxAtoi(wxStrtok((wxChar *) NULL,wxT(" "),&save_ptr));
+    }
+
+    mdy_to_julian ();
+}
+
+wxDate::wxDate (const wxDate &dt)
+{
+    DisplayFormat=dt.DisplayFormat;
+    DisplayOptions=dt.DisplayOptions;
+    month = dt.month;
+    day   = dt.day;
+    year  = dt.year;
+    mdy_to_julian ();
+}
+
+void wxDate::operator = (const wxDate &dt)
+{
+    DisplayFormat=dt.DisplayFormat;
+    DisplayOptions=dt.DisplayOptions;
+    month = dt.month;
+    day   = dt.day;
+    year  = dt.year;
+    mdy_to_julian (); // wxUSE_TIMEDATE
+}
+
+void wxDate::operator = (const wxString& dat)
+{
+    DisplayFormat=wxMDY;
+    DisplayOptions='\0';
+    if (wxStrcmp(dat, wxT("TODAY")) == 0 || wxStrcmp(dat, wxT("today")) == 0)
+    {
+        // Sets the current date
+        Set();
+    }
+    else
+    {
+        wxChar buf[100];
+        wxStrcpy(buf, dat);
+
+        wxChar *save_ptr, *token = wxStrtok(buf,wxT("/-"),&save_ptr);
+        month = wxAtoi(token);
+        day   = wxAtoi(wxStrtok((wxChar *) NULL,wxT("/-"),&save_ptr));
+        year  = wxAtoi(wxStrtok((wxChar *) NULL,wxT(" "),&save_ptr));
+    }
+
+    mdy_to_julian ();
+}
+
+//////////////////////////////////////////////////////////////
+// Conversion operations
+//////////////////////////////////////////////////////////////
+
+#ifndef __SALFORDC__
+wxDate::operator wxString( void )
+{
+    return FormatDate();
+}
+#endif
+
+//////////////////////////////////////////////////////////////
+// Date Arithmetic
+//////////////////////////////////////////////////////////////
+
+wxDate wxDate::operator + (long i)
+{
+    wxDate dp(julian + i);
+    return dp;
+}
+
+wxDate wxDate::operator + (int i)
+{
+    wxDate dp(julian + (long)i);
+    return dp;
+}
+
+wxDate wxDate::operator - (long i)
+{
+    wxDate dp(julian - i);
+    return dp;
+}
+
+wxDate wxDate::operator - (int i)
+{
+    wxDate dp(julian - (long)i);
+    return dp;
+}
+
+long wxDate::operator - (const wxDate &dt)
+{
+    return ( julian - dt.julian );
+}
+
+wxDate &wxDate::operator += (long i)
+{
+    julian += i;
+    julian_to_mdy();
+    return *this;
+}
+
+wxDate &wxDate::operator -= (long i)
+{
+    julian -= i;
+    julian_to_mdy();
+    return *this;
+}
+
+wxDate &wxDate::operator ++()
+{
+    julian++;
+    julian_to_mdy();
+    return *this;
+}
+
+wxDate &wxDate::operator ++(int)
+{
+    julian++;
+    julian_to_mdy();
+    return *this;
+}
+
+wxDate &wxDate::operator --()
+{
+    julian--;
+    julian_to_mdy();
+    return *this;
+}
+
+wxDate &wxDate::operator --(int)
+{
+    julian--;
+    julian_to_mdy();
+    return *this;
+}
+
+//////////////////////////////////////////////////////////////
+// Date comparison
+//////////////////////////////////////////////////////////////
+
+bool WXDLLEXPORT operator <  (const wxDate &dt1, const wxDate &dt2)
+{
+    return ( dt1.julian < dt2.julian );
+}
+
+bool WXDLLEXPORT operator <= (const wxDate &dt1, const wxDate &dt2)
+{
+    return ( (dt1.julian == dt2.julian) || (dt1.julian < dt2.julian) );
+}
+
+bool WXDLLEXPORT operator >  (const wxDate &dt1, const wxDate &dt2)
+{
+    return ( dt1.julian > dt2.julian );
+}
+
+bool WXDLLEXPORT operator >= (const wxDate &dt1, const wxDate &dt2)
+{
+    return ( (dt1.julian == dt2.julian) || (dt1.julian > dt2.julian) );
+}
+
+bool WXDLLEXPORT operator == (const wxDate &dt1, const wxDate &dt2)
+{
+    return ( dt1.julian == dt2.julian );
+}
+
+bool WXDLLEXPORT operator != (const wxDate &dt1, const wxDate &dt2)
+{
+    return ( dt1.julian != dt2.julian );
+}
+
+
+#if wxUSE_STD_IOSTREAM
+
+////////////////////////////////////////////////////////////////
+// Ostream operations
+////////////////////////////////////////////////////////////////
+
+ostream WXDLLEXPORT & operator << (ostream &os, const wxDate &dt)
+{
+    return os << dt.FormatDate().mb_str();
+}
+
+#endif
+
+//////////////////////////////////////////////////////////////
+// Conversion routines
+//////////////////////////////////////////////////////////////
+
+void wxDate::julian_to_wday (void)
+{
+    // Correction by Peter Stadel <peters@jetcity.com>
+    day_of_week = (int)((julian - 2) % 7L);
+/*
+    day_of_week = (int) ((julian + 2) % 7 + 1);
+*/
+}
+
+void wxDate::julian_to_mdy ()
+{
+    long a,b,c,d,e,z,alpha;
+    z = julian+1;
+    // dealing with Gregorian calendar reform
+    if (z < 2299161L)
+        a = z;
+    else {
+        alpha = (long) ((z-1867216.25) / 36524.25);
+        a = z + 1 + alpha - alpha/4;
+    }
+    b = ( a > 1721423 ? a + 1524 : a + 1158 );
+    c = (long) ((b - 122.1) / 365.25);
+    d = (long) (365.25 * c);
+    e = (long) ((b - d) / 30.6001);
+    day = (int)(b - d - (long)(30.6001 * e));
+    month = (int)((e < 13.5) ? e - 1 : e - 13);
+    year = (int)((month > 2.5 ) ? (c - 4716) : c - 4715);
+    julian_to_wday ();
+}
+
+void wxDate::mdy_to_julian (void)
+{
+    int a,b=0;
+    int work_month=month, work_day=day, work_year=year;
+    // correct for negative year
+    if (work_year < 0)
+        work_year++;
+    if (work_month <= 2)
+    { work_year--; work_month +=12; }
+
+    // deal with Gregorian calendar
+    if (work_year*10000. + work_month*100. + work_day >= 15821015.)
+    {
+        a = (int)(work_year/100.);
+        b = 2 - a + a/4;
+    }
+    julian = (long) (365.25*work_year) +
+        (long) (30.6001 * (work_month+1))  +  work_day + 1720994L + b;
+    julian_to_wday ();
+}
+
+////////////////////////////////////////////////////////////////
+// Format routine
+////////////////////////////////////////////////////////////////
+
+wxString wxDate::FormatDate (int type) const
+{
+    int actualType = type;
+    if (actualType == -1)
+        actualType = DisplayFormat;
+
+    wxChar buf[40];
+
+    memset( buf, '\0', sizeof(buf) );
+    switch ( actualType )
+    {
+        case wxDAY:
+            if ( (day_of_week < 1) || (day_of_week > 7) )
+                wxStrcpy(buf, _("invalid day"));
+            else
+                wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]),
+               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
+            return wxString(buf);
+
+        case wxMONTH:
+            if ( (month < 1) || (month > 12) )
+                wxStrcpy(buf, _("invalid month"));
+            else
+                wxStrncpy( buf, wxGetTranslation(mname[month-1]),
+               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
+            return wxString(buf);
+
+        case wxFULL:
+            if ( (month < 1) || (month > 12) || (day_of_week < 0) ||
+                    (day_of_week > 7) )
+            {
+                wxStrcpy(buf, _("invalid date"));
+                return wxString(buf);
+            }
+            wxStrncpy( buf, wxGetTranslation(dayname[day_of_week-1]),
+               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
+            wxStrcat( buf, wxT(", "));
+            wxStrncat( buf, wxGetTranslation(mname[month-1]),
+               (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
+            wxStrcat( buf, wxT(" "));
+            wxSprintf( buf+wxStrlen(buf), wxT("%d, %d"), day, abs(year) );
+            if (year < 0)
+                wxStrcat(buf,_(" B.C."));
+            return wxString(buf);
+
+        case wxEUROPEAN:
+            if ( (month < 1) || (month > 12) || (day_of_week < 0) ||
+                    (day_of_week > 7) )
+            {
+                wxStrcpy(buf, _("invalid date"));
+                return wxString(buf);
+            }
+            wxSprintf(buf,wxT("%d "),  day);
+            wxStrncat(buf, wxGetTranslation(mname[month-1]),
+                    (DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
+            wxSprintf( buf+wxStrlen(buf), wxT(" %d"), abs(year) );
+            if (year < 0)
+                wxStrcat(buf, _(" B.C."));
+            return wxString(buf);
+
+        case wxMDY:
+        default:
+            if (day==0 || month==0 || year==0)
+                wxStrcpy(buf, _("invalid date"));
+            else
+                wxSprintf( buf+wxStrlen(buf), wxT("%1d/%1d/%02d"), month, day,
+               (DisplayOptions & wxNO_CENTURY) && (abs(year) > 1899)
+               ? (abs(year) - (abs(year) / 100 * 100))
+               : (abs(year))  );
+            return wxString(buf);
+    }
+}
+
+void wxDate::SetFormat( int format )
+{
+    DisplayFormat = format;
+}
+
+int wxDate::SetOption( int option, bool action )
+{
+    switch ( option )
+    {
+        case wxNO_CENTURY:
+            if ( action )
+                DisplayOptions |= wxNO_CENTURY;
+            else
+            {
+                DisplayOptions &= (~wxNO_CENTURY);
+            }
+            return 1;
+        case wxDATE_ABBR:
+            if ( action )
+                DisplayOptions |= wxDATE_ABBR;
+            else
+            {
+                DisplayOptions &= (~wxDATE_ABBR);
+            }
+            return 1;
+        default:
+            return 0;
+    }
+}
+
+///////////////////////////////////////////////////////////////
+//  Miscellaneous Routines
+///////////////////////////////////////////////////////////////
+
+long wxDate::GetJulianDate( void ) const
+{
+    return julian;
+}
+
+int wxDate::GetDayOfYear( void ) const
+{
+    wxDate temp( 1, 1, year );
+
+    return (int) (julian - temp.julian + 1);
+}
+
+
+bool wxDate::IsLeapYear( void ) const
+{
+    return  ( (year >= 1582) ?
+            (year % 4 == 0  &&  year % 100 != 0  ||  year % 400 == 0 ):
+            (year % 4 == 0) );
+}
+
+// Version 4.0 Extension to Public Interface - CDP
+
+wxDate& wxDate::Set()
+{
+    //#ifdef __WXMSW__
+#if 0
+    struct _dosdate_t sDate;
+    _dos_getdate(&sDate);
+
+    month = sDate.month;
+    day   = sDate.day;
+    year  = sDate.year;
+
+    mdy_to_julian();
+#else
+    time_t now = time((time_t *) NULL);
+    struct tm *localTime = localtime(&now);
+
+    month = localTime->tm_mon + 1;
+    day = localTime->tm_mday;
+    year = localTime->tm_year + 1900;
+
+    mdy_to_julian ();
+#endif
+    return *this;
+}
+
+wxDate& wxDate::Set(
+        int  nMonth,
+        int  nDay,
+        int  nYear)
+{
+    month = nMonth;
+    year  = nYear < 0 ? 9999 : nYear;
+    year  = nYear > 9999 ? 0 : nYear;
+    day   = nDay < GetDaysInMonth() ? nDay : GetDaysInMonth();
+
+    mdy_to_julian();
+    return *this;
+}
+
+wxDate &
+wxDate::Set(long j)
+{
+    julian = j;
+
+    julian_to_mdy();
+    return *this;
+}
+
+
+int wxDate::GetDaysInMonth()
+{
+    return GauDays[month-1] + (month==2 && IsLeapYear());
+}
+
+int wxDate::GetFirstDayOfMonth() const
+{
+    return wxDate(month, 1, year).GetDayOfWeek();
+}
+
+int wxDate::GetDay() const
+{
+    return day;
+}
+
+int wxDate::GetDayOfWeek() const
+{
+    return day_of_week;
+}
+
+int wxDate::GetYear() const
+{
+    return year;
+}
+
+int wxDate::GetMonth() const
+{
+    return month;
+}
+
+wxDate& wxDate::AddWeeks(int nCount)
+{
+    Set(julian + (long)nCount*7);
+    return *this;
+}
+
+wxDate& wxDate::AddMonths(int nCount)
+{
+    month += nCount;
+
+    if (month < 1) {
+        month = 12;
+        year--;
+    }
+
+    if (month > 12) {
+        month = 1;
+        year++;
+    }
+    mdy_to_julian();
+    return *this;
+}
+
+wxDate& wxDate::AddYears(int nCount)
+{
+    year += nCount;
+    mdy_to_julian();
+    return *this;
+}
+
+int wxDate::GetWeekOfMonth()
+{
+    // Abs day includes the days from previous month that fills up
+    // the begin. of the week.
+    int nAbsDay = day + GetFirstDayOfMonth()-1;
+    return (nAbsDay-GetDayOfWeek())/7 + 1;
+}
+
+int wxDate::GetWeekOfYear()
+{
+    wxDate   doTemp(1, 1, year);
+    return (int)(((julian - doTemp.julian+1)/7) + 1);
+}
+
+wxDate wxDate::GetMonthStart()
+{
+    return(wxDate(month, 1, year));
+}
+
+wxDate wxDate::GetMonthEnd()
+{
+    return(wxDate(month+1, 1, year)-1);
+}
+
+wxDate wxDate::GetYearStart()
+{
+    return(wxDate(1, 1, year));
+}
+
+wxDate wxDate::GetYearEnd()
+{
+    return(wxDate(1, 1, year+1)-1);
+}
+
+wxString wxDate::GetMonthName()
+{
+    return(FormatDate(wxMONTH));
+}
+
+wxString wxDate::GetDayOfWeekName()
+{
+    return(FormatDate(wxDAY));
+}
+
+bool wxDate::IsBetween(const wxDate& first, const wxDate& second) const
+{
+    return (julian >= first.julian && julian <= second.julian);
+}
+
+// This function is from NIHCL
+wxDate wxDate::Previous(int dayOfWeek) const
+{
+    int this_day_Of_Week, desired_day_Of_Week;
+    long j;
+
+    //      Set the desired and current day of week to start at 0 (Monday)
+    //      and end at 6 (Sunday).
+
+    desired_day_Of_Week = dayOfWeek - 1; // These functions return a value
+    this_day_Of_Week    = GetDayOfWeek() - 1;            // from 1-7.  Subtract 1 for 0-6.
+    j = julian;
+
+    //      Have to determine how many days difference from current day back to
+    //      desired, if any.  Special calculation under the 'if' statement to
+    //      effect the wraparound counting from Monday (0) back to Sunday (6).
+
+    if (desired_day_Of_Week > this_day_Of_Week)
+        this_day_Of_Week += 7 - desired_day_Of_Week;
+    else
+        this_day_Of_Week -= desired_day_Of_Week;
+    j -= this_day_Of_Week; // Adjust j to set it at the desired day of week.
+    return wxDate(j);
+}
+
+#endif

src/common/time.cpp

@@ -0,0 +1,447 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        time.cpp
+// Purpose:     wxTime class, from NIHCL
+// Author:      Julian Smart, after K. E. Gorlen
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart and Markus Holzem
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "time.h"
+#endif
+
+/*
+Provides an object that represents a Time, stored as the number of
+seconds since January 1, 1901, GMT.
+*/
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "wx/setup.h"
+
+#if wxUSE_TIMEDATE
+
+#include "wx/time.h"
+#include "wx/date.h"
+#include "wx/utils.h"
+#include "wx/intl.h"
+
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+    #if wxUSE_IOSTREAMH
+        #include <iomanip.h>
+    #else
+        #include <iomanip>
+    #endif
+#endif
+
+#include <string.h>
+#include <time.h>
+
+IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
+
+
+#ifndef WX_TIMEZONE
+    #define WX_TIMEZONE _timezone
+#endif
+
+extern long wxGetUTCTime(void);
+bool wxGetTZandDST(long *timeZone, int *dstObserved)
+{
+  time_t now;
+  struct tm *tm;
+
+  now = time((time_t *) NULL);
+
+  if (now != (time_t)-1)
+  {
+    tm = localtime(&now);
+
+    if ((tm) && (tm->tm_isdst > 0))
+      *dstObserved = 1;
+  }
+  *timeZone = WX_TIMEZONE;
+
+  return TRUE;
+}
+
+
+static long TIME_ZONE;          /* seconds west of GMT */
+static int DST_OBSERVED;        /* flags U.S. daylight saving time observed */
+
+static bool wxTimeInitialized = FALSE;
+
+wxTime::tFormat    wxTime::Format    = wxTime::wx12h;
+wxTime::tPrecision wxTime::Precision  = wxTime::wxStdMinSec;
+
+static const unsigned long seconds_in_day = 24*60*60L;
+static const wxDate refDate(1,1,1901);
+// static const wxDate maxDate(49709L);      /* ((2**32)-1)/seconds_in_day -1 */
+
+wxTime wxTime::GetLocalTime(const wxDate& date, hourTy h, minuteTy m, secondTy s)
+/*
+      Return a local wxTime for the specified Standard Time date, hour, minute,
+      and second.
+*/
+{
+  if (!wxTimeInitialized)
+  {
+   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;
+  }
+/*
+      if (!date.IsBetween(refDate,maxDate))
+           setError(NIHCL_DATERANGE,DEFAULT,
+                date.dayOfMonth(),date.nameOfMonth(),date.year());
+*/
+  // The following line causes an error in GCC 2.1
+//   long daysBetween = date-refDate;
+  // ... but this seems to get round it.
+  wxDate tmp1(date);
+  wxDate tmp2(refDate);
+  long daysBetween = tmp1 - tmp2;
+
+  return wxTime(seconds_in_day*daysBetween + 60*60L*h + 60*m + s);
+}
+
+wxTime::wxTime()
+/*
+      Construct a wxTime for this instant.
+*/
+{
+  if (!wxTimeInitialized)
+  {
+   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;
+  }
+  sec = wxGetUTCTime();
+#ifdef __SALFORDC__
+  sec += (unsigned long) 2177452800;     /* seconds from 1/1/01 to 1/1/70 */
+#else
+  sec += 2177452800UL;     /* seconds from 1/1/01 to 1/1/70 */
+#endif
+}
+
+wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
+/*
+      Construct a wxTime for today at the specified (local) hour, minute, and
+      second.
+*/
+{
+  if (!wxTimeInitialized)
+  {
+   wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;
+  }
+
+  sec = wxTime(wxDate(),h,m,s,dst).sec;
+}
+
+
+wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
+/*
+        Construct a wxTime for the specified (local) Date, hour, minute, and
+        second.
+*/
+{
+  if (!wxTimeInitialized)
+  {
+    wxGetTZandDST(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;
+  }
+  sec = GetLocalTime(date,h,m,s).sec-3600;
+  if (IsDST())
+  {
+    sec += 3600;
+    if (IsDST() || dst) sec -= 3600;
+  }
+  else
+  {
+    sec += 3600;
+/*
+                if (IsDST()) setError(NIHCL_BADTIME,DEFAULT,
+                date.dayOfMonth(),date.nameOfMonth(),date.year(),
+                h,m,s,(dst?_("DST"):""));
+*/
+  }
+  sec += TIME_ZONE;                               // adjust to GMT
+}
+
+#ifndef __SALFORDC__
+wxTime::operator wxDate() const
+/*
+      Convert a wxTime to a local wxDate
+*/
+{
+//      return wxDate((int)(GetLocalTime().sec/seconds_in_day));     4.2 cc bug
+      long daycount = (long)(GetLocalTime().sec/seconds_in_day);
+
+        wxDate date(1,1,1901);
+        date += daycount;
+        return date;
+}
+#endif
+
+bool wxTime::IsBetween(const wxTime& a, const wxTime& b) const
+{
+        return *this >= a && *this <= b;
+}
+
+hourTy wxTime::GetHour() const
+/*
+      Return the hour of this wxTime in local time; i.e., adjust for
+        time zone and Daylight Savings Time.
+*/
+{
+      return GetLocalTime().GetHourGMT();
+}
+
+hourTy wxTime::GetHourGMT() const
+/*
+        Return the hour of this Time in GMT.
+*/
+{
+      return (hourTy)((sec % 86400) / 3600);
+}
+
+wxTime wxTime::GetBeginDST(unsigned year)
+/*
+      Return the local Standard Time at which Daylight Savings Time
+        begins in the specified year.
+*/
+{
+        // Previous Sunday
+        wxTime DSTtime(GetLocalTime(wxDate(3,31,year).Previous(1)+7,2));
+        if (year<=1986) {
+                // Previous Sunday
+           DSTtime = GetLocalTime(wxDate(4,30,year).Previous(1),2);
+           if (year==1974) DSTtime = GetLocalTime(wxDate(1,6,1974),2);
+                if (year==1975) DSTtime = GetLocalTime(wxDate(2,23,1975),2);
+        }
+        return DSTtime;
+}
+
+wxTime wxTime::GetEndDST(unsigned year)
+/*
+        Return the local Standard Time at which Daylight Savings Time
+        ends in the specified year.
+*/
+{
+      wxTime STDtime(GetLocalTime(wxDate(10,31,year).Previous(1),2-1));
+      return STDtime;
+}
+
+bool wxTime::IsDST() const
+/*
+        Return TRUE if this local Standard Time should be adjusted
+        for Daylight Savings Time.
+*/
+{
+        long daycount = (long)(sec/seconds_in_day);
+
+        // At this point, daycount is the number of days from 1/1/1901.
+      // Need to convert to julian date (which starts at 1/1/4713 B.C.)
+      wxDate date(1,1,1901);
+        date += daycount;
+
+        unsigned year = date.GetYear();
+      if (DST_OBSERVED)
+        {
+                if (*this >= GetBeginDST(year))
+                        if (*this < GetEndDST(year)) return TRUE;
+        }
+        return FALSE;
+}
+
+wxTime wxTime::GetLocalTime() const
+/*
+        Adjusts this GM Time for local time zone and Daylight Savings Time.
+*/
+{
+      wxTime local_time(sec-TIME_ZONE);
+        if (local_time.IsDST()) local_time.sec += 3600;
+        return local_time;
+}
+
+minuteTy wxTime::GetMinute() const
+/*
+        Return the minute of this wxTime in local time; i.e., adjust
+      for time zone and Daylight Savings Time.
+*/
+{
+        return GetLocalTime().GetMinuteGMT();
+}
+
+minuteTy wxTime::GetMinuteGMT() const
+/*
+        Return the minute of this wxTime in GMT.
+*/
+{
+      return (minuteTy)(((sec % 86400) % 3600) / 60);
+}
+
+secondTy wxTime::GetSecond() const
+/*
+        Return the second of this wxTime.
+*/
+{
+      return (secondTy)(((sec % 86400) % 3600) % 60);
+}
+
+secondTy wxTime::GetSecondGMT() const
+/*
+        Return the minute of this wxTime in GMT.
+*/
+{
+        return (secondTy)(((sec % 86400) % 3600) % 60);
+}
+
+int wxTime::GetDay() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetDay();
+}
+
+int wxTime::GetDayOfWeek() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetDayOfWeek();
+}
+
+int wxTime::GetMonth() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetMonth();
+}
+
+int wxTime::GetYear() const
+{
+    wxDate da((wxDate) *this);
+    return da.GetYear();
+}
+
+wxTime wxTime::Max(const wxTime& t) const
+{
+        if (t < *this) return *this;
+        return t;
+}
+
+wxTime wxTime::Min(const wxTime& t) const
+{
+        if (t > *this) return *this;
+      return t;
+}
+
+#ifndef __SALFORDC__
+wxTime::operator wxChar *(void)
+{
+  return FormatTime();
+}
+#endif
+
+void wxTime::SetFormat(const wxTime::tFormat lFormat,
+                const wxTime::tPrecision lPrecision) {
+
+  wxTime::Format    = lFormat;
+  wxTime::Precision  = lPrecision;
+}
+
+wxChar *wxTime::FormatTime() const {
+  static wxChar  timeBuf[30];
+  unsigned    hh(GetHour());
+
+  switch (Format) {
+  case wx12h:
+    hh  -= 12;
+    break;
+  case wx24h:
+    break;
+  }
+
+  switch (Precision) {
+  case wxStdMinSec:
+    wxSprintf(timeBuf,wxT("%2d:%02d:%02d"),hh,GetMinute(),GetSecond());
+    break;
+  case wxStdMin:
+    wxSprintf(timeBuf,wxT("%2d:%02d"),hh,GetMinute());
+    break;
+  }
+
+  if (Format == wx12h)
+    if (GetHour() <= 12)
+      wxStrcat(timeBuf,_("am"));
+    else
+      wxStrcat(timeBuf,_("pm"));
+
+  return timeBuf;
+}
+
+/*
+int wxTime::compare(const Object& ob) const
+{
+      assertArgSpecies(ob,classDesc,"compare");
+        register clockTy t = castdown(ob).sec;
+        if (sec < t) return -1;
+        if (sec > t) return 1;
+        return 0;
+}
+
+void wxTime::deepenShallowCopy()  {}
+
+unsigned wxTime::hash() const     { return sec; }
+
+bool wxTime::isEqual(const Object& ob) const
+{
+        return ob.isSpecies(classDesc) && *this==castdown(ob);
+}
+
+const Class* wxTime::species() const { return &classDesc; }
+
+void wxTime::printOn(ostream& strm) const
+{
+        register unsigned hh = GetHour();
+        wxDate(*this).printOn(strm);
+        strm << ' ' << ((hh <= 12) ? hh : hh-12) << ':'
+             << setfill('0') << setw(2) << GetMinute() << ':'
+         << setfill('0') << setw(2) << GetSecond() << ' ';
+        if (hh < 12) strm << _("am");
+        else strm << _("pm");
+}
+
+wxTime::wxTime(OIOin& strm)
+      : BASE(strm)
+{
+      unsigned long usec;
+      strm >> sec >> usec;
+}
+
+void wxTime::storer(OIOout& strm) const
+{
+        BASE::storer(strm);
+        strm << sec << 0l;
+}
+
+
+wxTime::wxTime(OIOifd& fd)
+      : BASE(fd)
+{
+      unsigned long usec;
+      fd >> sec >> usec;
+}
+
+void wxTime::storer(OIOofd& fd) const
+{
+      BASE::storer(fd);
+      fd << sec << 0l;
+}
+*/
+
+#endif

src/gtk/combobox.cpp

@@ -1,715 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
-
-#include "wx/combobox.h"
-
-#if wxUSE_COMBOBOX
-
-#include "wx/settings.h"
-#include "wx/intl.h"
-
-#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "select"
-//-----------------------------------------------------------------------------
-
-static void
-gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
-
-    if (g_blockEventsOnDrag) return;
-
-    if (combo->m_alreadySent)
-    {
-        combo->m_alreadySent = FALSE;
-        return;
-    }
-
-    combo->m_alreadySent = TRUE;
-
-    int curSelection = combo->GetSelection();
-
-    if (combo->m_prevSelection != curSelection)
-    {
-        GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
-        gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
-    }
-
-    combo->m_prevSelection = curSelection;
-
-    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( curSelection );
-    event.SetString( combo->GetStringSelection() );
-    event.SetEventObject( combo );
-
-    combo->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-//  "changed"
-//-----------------------------------------------------------------------------
-
-static void
-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
-
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-    event.SetString( combo->GetValue() );
-    event.SetEventObject( combo );
-    combo->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
-    EVT_SIZE(wxComboBox::OnSize)
-    EVT_CHAR(wxComboBox::OnChar)
-END_EVENT_TABLE()
-
-bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
-                         const wxPoint& pos, const wxSize& size,
-                         int n, const wxString choices[],
-                         long style, const wxValidator& validator,
-                         const wxString& name )
-{
-    m_alreadySent = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-    m_prevSelection = 0;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, validator, name ))
-    {
-        wxFAIL_MSG( wxT("wxComboBox creation failed") );
-        return FALSE;
-    }
-
-    m_widget = gtk_combo_new();
-
-    // make it more useable
-    gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
-    
-    // and case-sensitive
-    gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
-
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
-
-    for (int i = 0; i < n; i++)
-    {
-        /* don't send first event, which GTK sends aways when
-           inserting the first item */
-        m_alreadySent = TRUE;
-
-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
-
-        m_clientDataList.Append( (wxObject*)NULL );
-        m_clientObjectList.Append( (wxObject*)NULL );
-
-        gtk_container_add( GTK_CONTAINER(list), list_item );
-
-        gtk_signal_connect( GTK_OBJECT(list_item), "select",
-           GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        gtk_widget_show( list_item );
-    }
-
-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    ConnectWidget( GTK_COMBO(m_widget)->button );
-
-    if (!value.IsNull()) SetValue( value );
-
-    if (style & wxCB_READONLY)
-        gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
-
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if (new_size.y > size_best.y)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-
-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );
-
-    Show( TRUE );
-
-    return TRUE;
-}
-
-wxComboBox::~wxComboBox()
-{
-    wxNode *node = m_clientObjectList.First();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
-}
-
-void wxComboBox::AppendCommon( const wxString &item )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
-
-    gtk_container_add( GTK_CONTAINER(list), list_item );
-
-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
-
-        if (m_widgetStyle) ApplyWidgetStyle();
-    }
-
-    gtk_widget_show( list_item );
-}
-
-void wxComboBox::Append( const wxString &item )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::SetClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-void* wxComboBox::GetClientData( int n )
-{
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
-
-    return node->Data();
-}
-
-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
-
-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxComboBox::GetClientObject( int n )
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
-
-    return (wxClientData*) node->Data();
-}
-
-void wxComboBox::Clear()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-
-    wxNode *node = m_clientObjectList.First();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
-}
-
-void wxComboBox::Delete( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-
-    GList *child = g_list_nth( listbox->children, n );
-
-    if (!child)
-    {
-        wxFAIL_MSG(wxT("wrong index"));
-        return;
-    }
-
-    GList *list = g_list_append( (GList*) NULL, child->data );
-    gtk_list_remove_items( listbox, list );
-    g_list_free( list );
-
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        m_clientObjectList.DeleteNode( node );
-    }
-
-    node = m_clientDataList.Nth( n );
-    if (node)
-    {
-        m_clientDataList.DeleteNode( node );
-    }
-}
-
-int wxComboBox::FindString( const wxString &item )
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        if (item == wxString(label->label,*wxConvCurrent))
-            return count;
-        count++;
-        child = child->next;
-    }
-
-    return wxNOT_FOUND;
-}
-
-int wxComboBox::GetSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
-    {
-        GList *child = GTK_LIST(list)->children;
-        int count = 0;
-        while (child)
-        {
-            if (child->data == selection->data) return count;
-            count++;
-            child = child->next;
-        }
-    }
-
-    return -1;
-}
-
-wxString wxComboBox::GetString( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    wxString str;
-    GList *child = g_list_nth( GTK_LIST(list)->children, n );
-    if (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        str = wxString(label->label,*wxConvCurrent);
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
-    }
-
-    return str;
-}
-
-wxString wxComboBox::GetStringSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
-    {
-        GtkBin *bin = GTK_BIN( selection->data );
-        wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
-        return tmp;
-    }
-
-    wxFAIL_MSG( wxT("wxComboBox: no selection") );
-
-    return wxT("");
-}
-
-int wxComboBox::Number() const
-{
-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child) { count++; child = child->next; }
-    return count;
-}
-
-void wxComboBox::SetSelection( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    DisableEvents();
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );
-    gtk_list_select_item( GTK_LIST(list), n );
-    m_prevSelection = n;
-
-    EnableEvents();
-}
-
-void wxComboBox::SetStringSelection( const wxString &string )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    int res = FindString( string );
-    if (res == -1) return;
-    SetSelection( res );
-}
-
-wxString wxComboBox::GetValue() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
-    return tmp;
-}
-
-void wxComboBox::SetValue( const wxString& value )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxT("");
-    if (!value.IsNull()) tmp = value;
-    gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );
-}
-
-void wxComboBox::Copy()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
-}
-
-void wxComboBox::Cut()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
-}
-
-void wxComboBox::Paste()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
-}
-
-void wxComboBox::SetInsertionPoint( long pos )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
-}
-
-void wxComboBox::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    SetInsertionPoint( -1 );
-}
-
-long wxComboBox::GetInsertionPoint() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    return (long) GTK_EDITABLE(entry)->current_pos;
-}
-
-long wxComboBox::GetLastPosition() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
-    return (long) pos-1;
-}
-
-void wxComboBox::Replace( long from, long to, const wxString& value )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-    // FIXME: not quite sure how to do this method right in multibyte mode
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-    if (value.IsNull()) return;
-    gint pos = (gint)to;
-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );
-}
-
-void wxComboBox::Remove(long from, long to)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
-void wxComboBox::SetSelection( long from, long to )
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
-void wxComboBox::SetEditable( bool editable )
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
-}
-
-void wxComboBox::OnChar( wxKeyEvent &event )
-{
-    if ( event.KeyCode() == WXK_RETURN )
-    {
-        wxString value = GetValue();
-
-        if ( Number() == 0 )
-        {
-            // make Enter generate "selected" event if there is only one item
-            // in the combobox - without it, it's impossible to select it at
-            // all!
-            wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-            event.SetInt( 0 );
-            event.SetString( value );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-        }
-        else
-        {
-            // add the item to the list if it's not there yet
-            if ( FindString(value) == wxNOT_FOUND )
-            {
-                Append(value);
-                SetStringSelection(value);
-
-                // and generate the selected event for it
-                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-                event.SetInt( Number() - 1 );
-                event.SetString( value );
-                event.SetEventObject( this );
-                GetEventHandler()->ProcessEvent( event );
-            }
-            //else: do nothing, this will open the listbox
-        }
-    }
-
-    event.Skip();
-}
-
-void wxComboBox::DisableEvents()
-{
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
-}
-
-void wxComboBox::EnableEvents()
-{
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_connect( GTK_OBJECT(child->data), "select",
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
-}
-
-void wxComboBox::OnSize( wxSizeEvent &event )
-{
-    event.Skip();
-
-#if 0
-    int w = 21;
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
-
-    gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
-#endif // 0
-}
-
-void wxComboBox::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-
-//    gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
-
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
-
-        GtkBin *bin = GTK_BIN(child->data);
-        gtk_widget_set_style( bin->child, m_widgetStyle );
-
-        child = child->next;
-    }
-}
-
-GtkWidget* wxComboBox::GetConnectWidget()
-{
-    return GTK_COMBO(m_widget)->entry;
-}
-
-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
-{
-    return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
-             (window == GTK_COMBO(m_widget)->button->window ) );
-}
-
-wxSize wxComboBox::DoGetBestSize() const
-{
-    wxSize ret( wxControl::DoGetBestSize() );
-
-    // we know better our horizontal extent: it depends on the longest string
-    // in the combobox
-    ret.x = 0;
-    if ( m_widget )
-    {
-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
-        size_t count = Number();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
-            if ( width > ret.x )
-                ret.x = width;
-        }
-    }
-
-    // empty combobox should have some reasonable default size too
-    if ( ret.x < 100 )
-        ret.x = 100;
-    return ret;
-}
-
-#endif

src/gtk/statbmp.cpp

@@ -1,122 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_STATBMP
-
-#include "wx/statbmp.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-//-----------------------------------------------------------------------------
-// wxStaticBitmap
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
-wxStaticBitmap::wxStaticBitmap(void)
-{
-}
-
-wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-    Create( parent, id, bitmap, pos, size, style, name );
-}
-
-void wxStaticBitmap::CreatePixmapWidget()
-{
-    wxCHECK_RET( m_bitmap.Ok(), wxT("should only be called if we have a bitmap") );
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if ( m_bitmap.GetMask() )
-        mask = m_bitmap.GetMask()->GetBitmap();
-    m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-    /* insert GTK representation */
-    (*m_parent->m_insertCallback)(m_parent, this);
-
-    gtk_widget_show( m_widget );
-
-    PostCreation();
-}
-
-bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-                             const wxPoint &pos, const wxSize &size,
-                             long style, const wxString &name )
-{
-    m_needParent = TRUE;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
-    {
-        wxFAIL_MSG( wxT("wxXX creation failed") );
-	return FALSE;
-    }
-
-    m_bitmap = bitmap;
-
-    if (m_bitmap.Ok())
-    {
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if ( m_bitmap.GetMask() )
-            mask = m_bitmap.GetMask()->GetBitmap();
-        m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-        SetBestSize( size );
-    }
-    else
-    {
-        m_widget = gtk_label_new( "Bitmap" );
-
-        PostCreation();
-    }
-
-    m_parent->DoAddChild( this );
-
-    Show( TRUE );
-
-    return TRUE;
-}
-
-void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
-{
-    bool hasWidget = m_bitmap.Ok();
-    m_bitmap = bitmap;
-
-    if (m_bitmap.Ok())
-    {
-        if (!hasWidget)
-        {
-            gtk_widget_destroy( m_widget );
-
-            /* recreate m_widget because we've created a label
-               and not a bitmap above */
-            CreatePixmapWidget();
-        }
-        else
-        {
-            GdkBitmap *mask = (GdkBitmap *) NULL;
-            if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-            gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
-        }
-
-        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
-    }
-}
-
-#endif // wxUSE_STATBMP
-

src/gtk1/combobox.cpp

@@ -1,715 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
-
-#include "wx/combobox.h"
-
-#if wxUSE_COMBOBOX
-
-#include "wx/settings.h"
-#include "wx/intl.h"
-
-#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
-
-extern bool   g_blockEventsOnDrag;
-
-//-----------------------------------------------------------------------------
-// "select"
-//-----------------------------------------------------------------------------
-
-static void
-gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
-
-    if (g_blockEventsOnDrag) return;
-
-    if (combo->m_alreadySent)
-    {
-        combo->m_alreadySent = FALSE;
-        return;
-    }
-
-    combo->m_alreadySent = TRUE;
-
-    int curSelection = combo->GetSelection();
-
-    if (combo->m_prevSelection != curSelection)
-    {
-        GtkWidget *list = GTK_COMBO(combo->m_widget)->list;
-        gtk_list_unselect_item( GTK_LIST(list), combo->m_prevSelection );
-    }
-
-    combo->m_prevSelection = curSelection;
-
-    wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
-    event.SetInt( curSelection );
-    event.SetString( combo->GetStringSelection() );
-    event.SetEventObject( combo );
-
-    combo->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-//  "changed"
-//-----------------------------------------------------------------------------
-
-static void
-gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!combo->m_hasVMT) return;
-
-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
-    event.SetString( combo->GetValue() );
-    event.SetEventObject( combo );
-    combo->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-// wxComboBox
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
-
-BEGIN_EVENT_TABLE(wxComboBox, wxControl)
-    EVT_SIZE(wxComboBox::OnSize)
-    EVT_CHAR(wxComboBox::OnChar)
-END_EVENT_TABLE()
-
-bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
-                         const wxPoint& pos, const wxSize& size,
-                         int n, const wxString choices[],
-                         long style, const wxValidator& validator,
-                         const wxString& name )
-{
-    m_alreadySent = FALSE;
-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-    m_prevSelection = 0;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, validator, name ))
-    {
-        wxFAIL_MSG( wxT("wxComboBox creation failed") );
-        return FALSE;
-    }
-
-    m_widget = gtk_combo_new();
-
-    // make it more useable
-    gtk_combo_set_use_arrows_always( GTK_COMBO(m_widget), TRUE );
-    
-    // and case-sensitive
-    gtk_combo_set_case_sensitive( GTK_COMBO(m_widget), TRUE );
-
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    gtk_list_set_selection_mode( GTK_LIST(list), GTK_SELECTION_MULTIPLE );
-
-    for (int i = 0; i < n; i++)
-    {
-        /* don't send first event, which GTK sends aways when
-           inserting the first item */
-        m_alreadySent = TRUE;
-
-        GtkWidget *list_item = gtk_list_item_new_with_label( choices[i].mbc_str() );
-
-        m_clientDataList.Append( (wxObject*)NULL );
-        m_clientObjectList.Append( (wxObject*)NULL );
-
-        gtk_container_add( GTK_CONTAINER(list), list_item );
-
-        gtk_signal_connect( GTK_OBJECT(list_item), "select",
-           GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        gtk_widget_show( list_item );
-    }
-
-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    ConnectWidget( GTK_COMBO(m_widget)->button );
-
-    if (!value.IsNull()) SetValue( value );
-
-    if (style & wxCB_READONLY)
-        gtk_entry_set_editable( GTK_ENTRY( GTK_COMBO(m_widget)->entry ), FALSE );
-
-    gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
-      GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
-
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if (new_size.y > size_best.y)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-
-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );
-
-    Show( TRUE );
-
-    return TRUE;
-}
-
-wxComboBox::~wxComboBox()
-{
-    wxNode *node = m_clientObjectList.First();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
-}
-
-void wxComboBox::AppendCommon( const wxString &item )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GtkWidget *list_item = gtk_list_item_new_with_label( item.mbc_str() );
-
-    gtk_container_add( GTK_CONTAINER(list), list_item );
-
-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-    if (GTK_WIDGET_REALIZED(m_widget))
-    {
-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
-
-        if (m_widgetStyle) ApplyWidgetStyle();
-    }
-
-    gtk_widget_show( list_item );
-}
-
-void wxComboBox::Append( const wxString &item )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
-
-    AppendCommon( item );
-}
-
-void wxComboBox::SetClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-void* wxComboBox::GetClientData( int n )
-{
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
-
-    return node->Data();
-}
-
-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
-
-    wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxComboBox::GetClientObject( int n )
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
-
-    return (wxClientData*) node->Data();
-}
-
-void wxComboBox::Clear()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
-
-    wxNode *node = m_clientObjectList.First();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
-    }
-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
-}
-
-void wxComboBox::Delete( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
-
-    GList *child = g_list_nth( listbox->children, n );
-
-    if (!child)
-    {
-        wxFAIL_MSG(wxT("wrong index"));
-        return;
-    }
-
-    GList *list = g_list_append( (GList*) NULL, child->data );
-    gtk_list_remove_items( listbox, list );
-    g_list_free( list );
-
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        m_clientObjectList.DeleteNode( node );
-    }
-
-    node = m_clientDataList.Nth( n );
-    if (node)
-    {
-        m_clientDataList.DeleteNode( node );
-    }
-}
-
-int wxComboBox::FindString( const wxString &item )
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        if (item == wxString(label->label,*wxConvCurrent))
-            return count;
-        count++;
-        child = child->next;
-    }
-
-    return wxNOT_FOUND;
-}
-
-int wxComboBox::GetSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
-    {
-        GList *child = GTK_LIST(list)->children;
-        int count = 0;
-        while (child)
-        {
-            if (child->data == selection->data) return count;
-            count++;
-            child = child->next;
-        }
-    }
-
-    return -1;
-}
-
-wxString wxComboBox::GetString( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    wxString str;
-    GList *child = g_list_nth( GTK_LIST(list)->children, n );
-    if (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-        str = wxString(label->label,*wxConvCurrent);
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("wxComboBox: wrong index") );
-    }
-
-    return str;
-}
-
-wxString wxComboBox::GetStringSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *selection = GTK_LIST(list)->selection;
-    if (selection)
-    {
-        GtkBin *bin = GTK_BIN( selection->data );
-        wxString tmp = wxString(GTK_LABEL( bin->child )->label,*wxConvCurrent);
-        return tmp;
-    }
-
-    wxFAIL_MSG( wxT("wxComboBox: no selection") );
-
-    return wxT("");
-}
-
-int wxComboBox::Number() const
-{
-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-
-    GList *child = GTK_LIST(list)->children;
-    int count = 0;
-    while (child) { count++; child = child->next; }
-    return count;
-}
-
-void wxComboBox::SetSelection( int n )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    DisableEvents();
-
-    GtkWidget *list = GTK_COMBO(m_widget)->list;
-    gtk_list_unselect_item( GTK_LIST(list), m_prevSelection );
-    gtk_list_select_item( GTK_LIST(list), n );
-    m_prevSelection = n;
-
-    EnableEvents();
-}
-
-void wxComboBox::SetStringSelection( const wxString &string )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    int res = FindString( string );
-    if (res == -1) return;
-    SetSelection( res );
-}
-
-wxString wxComboBox::GetValue() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxString(gtk_entry_get_text( GTK_ENTRY(entry) ),*wxConvCurrent);
-    return tmp;
-}
-
-void wxComboBox::SetValue( const wxString& value )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    wxString tmp = wxT("");
-    if (!value.IsNull()) tmp = value;
-    gtk_entry_set_text( GTK_ENTRY(entry), tmp.mbc_str() );
-}
-
-void wxComboBox::Copy()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
-}
-
-void wxComboBox::Cut()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
-}
-
-void wxComboBox::Paste()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-#if defined(__WXGTK13__) || (GTK_MINOR_VERSION > 0)
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
-#else
-    gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
-#endif
-}
-
-void wxComboBox::SetInsertionPoint( long pos )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
-}
-
-void wxComboBox::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    SetInsertionPoint( -1 );
-}
-
-long wxComboBox::GetInsertionPoint() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    return (long) GTK_EDITABLE(entry)->current_pos;
-}
-
-long wxComboBox::GetLastPosition() const
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    int pos = GTK_ENTRY(entry)->text_length;
-    return (long) pos-1;
-}
-
-void wxComboBox::Replace( long from, long to, const wxString& value )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-    // FIXME: not quite sure how to do this method right in multibyte mode
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-    if (value.IsNull()) return;
-    gint pos = (gint)to;
-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.mbc_str(), value.Length(), &pos );
-}
-
-void wxComboBox::Remove(long from, long to)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
-void wxComboBox::SetSelection( long from, long to )
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_select_region( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-
-void wxComboBox::SetEditable( bool editable )
-{
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_entry_set_editable( GTK_ENTRY(entry), editable );
-}
-
-void wxComboBox::OnChar( wxKeyEvent &event )
-{
-    if ( event.KeyCode() == WXK_RETURN )
-    {
-        wxString value = GetValue();
-
-        if ( Number() == 0 )
-        {
-            // make Enter generate "selected" event if there is only one item
-            // in the combobox - without it, it's impossible to select it at
-            // all!
-            wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-            event.SetInt( 0 );
-            event.SetString( value );
-            event.SetEventObject( this );
-            GetEventHandler()->ProcessEvent( event );
-        }
-        else
-        {
-            // add the item to the list if it's not there yet
-            if ( FindString(value) == wxNOT_FOUND )
-            {
-                Append(value);
-                SetStringSelection(value);
-
-                // and generate the selected event for it
-                wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
-                event.SetInt( Number() - 1 );
-                event.SetString( value );
-                event.SetEventObject( this );
-                GetEventHandler()->ProcessEvent( event );
-            }
-            //else: do nothing, this will open the listbox
-        }
-    }
-
-    event.Skip();
-}
-
-void wxComboBox::DisableEvents()
-{
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
-}
-
-void wxComboBox::EnableEvents()
-{
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_signal_connect( GTK_OBJECT(child->data), "select",
-          GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-
-        child = child->next;
-    }
-}
-
-void wxComboBox::OnSize( wxSizeEvent &event )
-{
-    event.Skip();
-
-#if 0
-    int w = 21;
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
-
-    gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
-    gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
-#endif // 0
-}
-
-void wxComboBox::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-
-//    gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
-    gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
-
-    GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
-    GList *child = list->children;
-    while (child)
-    {
-        gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
-
-        GtkBin *bin = GTK_BIN(child->data);
-        gtk_widget_set_style( bin->child, m_widgetStyle );
-
-        child = child->next;
-    }
-}
-
-GtkWidget* wxComboBox::GetConnectWidget()
-{
-    return GTK_COMBO(m_widget)->entry;
-}
-
-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
-{
-    return ( (window == GTK_ENTRY( GTK_COMBO(m_widget)->entry )->text_area) ||
-             (window == GTK_COMBO(m_widget)->button->window ) );
-}
-
-wxSize wxComboBox::DoGetBestSize() const
-{
-    wxSize ret( wxControl::DoGetBestSize() );
-
-    // we know better our horizontal extent: it depends on the longest string
-    // in the combobox
-    ret.x = 0;
-    if ( m_widget )
-    {
-        GdkFont *font = m_font.GetInternalFont();
-
-        wxCoord width;
-        size_t count = Number();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
-            if ( width > ret.x )
-                ret.x = width;
-        }
-    }
-
-    // empty combobox should have some reasonable default size too
-    if ( ret.x < 100 )
-        ret.x = 100;
-    return ret;
-}
-
-#endif

src/gtk1/statbmp.cpp

@@ -1,122 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.cpp
-// Purpose:
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_STATBMP
-
-#include "wx/statbmp.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-//-----------------------------------------------------------------------------
-// wxStaticBitmap
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap,wxControl)
-
-wxStaticBitmap::wxStaticBitmap(void)
-{
-}
-
-wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-    Create( parent, id, bitmap, pos, size, style, name );
-}
-
-void wxStaticBitmap::CreatePixmapWidget()
-{
-    wxCHECK_RET( m_bitmap.Ok(), wxT("should only be called if we have a bitmap") );
-
-    GdkBitmap *mask = (GdkBitmap *) NULL;
-    if ( m_bitmap.GetMask() )
-        mask = m_bitmap.GetMask()->GetBitmap();
-    m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-    /* insert GTK representation */
-    (*m_parent->m_insertCallback)(m_parent, this);
-
-    gtk_widget_show( m_widget );
-
-    PostCreation();
-}
-
-bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
-                             const wxPoint &pos, const wxSize &size,
-                             long style, const wxString &name )
-{
-    m_needParent = TRUE;
-
-    if (!PreCreation( parent, pos, size ) ||
-        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
-    {
-        wxFAIL_MSG( wxT("wxXX creation failed") );
-	return FALSE;
-    }
-
-    m_bitmap = bitmap;
-
-    if (m_bitmap.Ok())
-    {
-        GdkBitmap *mask = (GdkBitmap *) NULL;
-        if ( m_bitmap.GetMask() )
-            mask = m_bitmap.GetMask()->GetBitmap();
-        m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
-
-        SetBestSize( size );
-    }
-    else
-    {
-        m_widget = gtk_label_new( "Bitmap" );
-
-        PostCreation();
-    }
-
-    m_parent->DoAddChild( this );
-
-    Show( TRUE );
-
-    return TRUE;
-}
-
-void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
-{
-    bool hasWidget = m_bitmap.Ok();
-    m_bitmap = bitmap;
-
-    if (m_bitmap.Ok())
-    {
-        if (!hasWidget)
-        {
-            gtk_widget_destroy( m_widget );
-
-            /* recreate m_widget because we've created a label
-               and not a bitmap above */
-            CreatePixmapWidget();
-        }
-        else
-        {
-            GdkBitmap *mask = (GdkBitmap *) NULL;
-            if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap();
-            gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask );
-        }
-
-        SetBestSize(wxSize(bitmap.GetWidth(), bitmap.GetHeight()));
-    }
-}
-
-#endif // wxUSE_STATBMP
-