From 29149a64916d6fdc53e445adca9ef83bc58fb6c3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 26 Jun 2001 21:29:16 +0000 Subject: [PATCH 1/1] compilation fixes - wxGTK compiles but not links git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/listctrl.h | 6 ++-- include/wx/gtk/bmpbuttn.h | 17 +++++---- include/wx/gtk/scrolwin.h | 14 ++++---- include/wx/gtk1/bmpbuttn.h | 17 +++++---- include/wx/gtk1/scrolwin.h | 14 ++++---- src/generic/listctrl.cpp | 5 +++ src/generic/logg.cpp | 2 -- src/gtk/bmpbuttn.cpp | 67 ++++++++++------------------------- src/gtk/notebook.cpp | 10 ------ src/gtk/region.cpp | 8 ++--- src/gtk1/bmpbuttn.cpp | 67 ++++++++++------------------------- src/gtk1/notebook.cpp | 10 ------ src/gtk1/region.cpp | 8 ++--- 13 files changed, 80 insertions(+), 165 deletions(-) diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 2a719a8ea8..c0fca1fe46 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -70,7 +70,7 @@ public: Create(parent, id, pos, size, style, validator, name); } ~wxListCtrl(); - + bool Create( wxWindow *parent, wxWindowID id = -1, const wxPoint &pos = wxDefaultPosition, @@ -140,7 +140,7 @@ public: bool ScrollList( int dx, int dy ); bool SortItems( wxListCtrlCompare fn, long data ); bool Update( long item ); - + void OnIdle( wxIdleEvent &event ); void OnSize( wxSizeEvent &event ); @@ -167,7 +167,7 @@ public: wxImageList *m_imageListNormal; wxImageList *m_imageListSmall; wxImageList *m_imageListState; // what's that ? - bool m_ownsImageListNormal, + bool m_ownsImageListNormal, m_ownsImageListSmall, m_ownsImageListState; wxListHeaderWindow *m_headerWin; diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index baae20d297..92eda41c8c 100644 --- a/include/wx/gtk/bmpbuttn.h +++ b/include/wx/gtk/bmpbuttn.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbutton.h +// Name: wx/gtk/bmpbutton.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,24 +45,23 @@ public: virtual void SetDefault(); virtual bool Enable(bool enable = TRUE); - + void SetLabel( const wxString &label ); wxString GetLabel() const; virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } - + // implementation // -------------- - + void HasFocus(); void NotFocus(); void StartSelect(); void EndSelect(); - void SetBitmap(); - void ApplyWidgetStyle(); - + void ApplyWidgetStyle(); + bool m_hasFocus; bool m_isSelected; - + protected: virtual void OnSetBitmap(); diff --git a/include/wx/gtk/scrolwin.h b/include/wx/gtk/scrolwin.h index c9abfd3dce..e924016420 100644 --- a/include/wx/gtk/scrolwin.h +++ b/include/wx/gtk/scrolwin.h @@ -39,7 +39,7 @@ class WXDLLEXPORT wxScrolledWindow : public wxPanel public: wxScrolledWindow() { Init(); } - + wxScrolledWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, @@ -47,7 +47,7 @@ public: long style = wxScrolledWindowStyle, const wxString& name = wxPanelNameStr) { Create(parent, id, pos, size, style, name); } - + void Init(); bool Create(wxWindow *parent, @@ -110,7 +110,7 @@ public: // Adjust the scrollbars virtual void AdjustScrollbars(); - + // Set the scale factor, used in PrepareDC void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; } double GetScaleX() const { return m_scaleX; } @@ -121,7 +121,7 @@ public: void OnSize(wxSizeEvent& event); void OnPaint(wxPaintEvent& event); void OnChar(wxKeyEvent& event); - + void GtkVScroll( float value ); void GtkHScroll( float value ); void GtkVConnectEvent(); @@ -131,10 +131,10 @@ public: // Calculate scroll increment virtual int CalcScrollInc(wxScrollWinEvent& event); - + // Overridden from wxWindows due callback being static virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); - + protected: wxWindow *m_targetWindow; int m_xScrollPixelsPerLine; @@ -147,7 +147,7 @@ protected: int m_yScrollLines; int m_xScrollLinesPerPage; int m_yScrollLinesPerPage; - + double m_scaleY,m_scaleX; private: diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h index baae20d297..92eda41c8c 100644 --- a/include/wx/gtk1/bmpbuttn.h +++ b/include/wx/gtk1/bmpbuttn.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbutton.h +// Name: wx/gtk/bmpbutton.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,24 +45,23 @@ public: virtual void SetDefault(); virtual bool Enable(bool enable = TRUE); - + void SetLabel( const wxString &label ); wxString GetLabel() const; virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } - + // implementation // -------------- - + void HasFocus(); void NotFocus(); void StartSelect(); void EndSelect(); - void SetBitmap(); - void ApplyWidgetStyle(); - + void ApplyWidgetStyle(); + bool m_hasFocus; bool m_isSelected; - + protected: virtual void OnSetBitmap(); diff --git a/include/wx/gtk1/scrolwin.h b/include/wx/gtk1/scrolwin.h index c9abfd3dce..e924016420 100644 --- a/include/wx/gtk1/scrolwin.h +++ b/include/wx/gtk1/scrolwin.h @@ -39,7 +39,7 @@ class WXDLLEXPORT wxScrolledWindow : public wxPanel public: wxScrolledWindow() { Init(); } - + wxScrolledWindow(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, @@ -47,7 +47,7 @@ public: long style = wxScrolledWindowStyle, const wxString& name = wxPanelNameStr) { Create(parent, id, pos, size, style, name); } - + void Init(); bool Create(wxWindow *parent, @@ -110,7 +110,7 @@ public: // Adjust the scrollbars virtual void AdjustScrollbars(); - + // Set the scale factor, used in PrepareDC void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; } double GetScaleX() const { return m_scaleX; } @@ -121,7 +121,7 @@ public: void OnSize(wxSizeEvent& event); void OnPaint(wxPaintEvent& event); void OnChar(wxKeyEvent& event); - + void GtkVScroll( float value ); void GtkHScroll( float value ); void GtkVConnectEvent(); @@ -131,10 +131,10 @@ public: // Calculate scroll increment virtual int CalcScrollInc(wxScrollWinEvent& event); - + // Overridden from wxWindows due callback being static virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE ); - + protected: wxWindow *m_targetWindow; int m_xScrollPixelsPerLine; @@ -147,7 +147,7 @@ protected: int m_yScrollLines; int m_xScrollLinesPerPage; int m_yScrollLinesPerPage; - + double m_scaleY,m_scaleX; private: diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 64ea6c0979..38985b43ff 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -3141,7 +3141,12 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data ) void wxListMainWindow::OnScroll(wxScrollWinEvent& event) { + // FIXME +#ifdef __WXGTK__ + wxScrolledWindow::OnScroll(event); +#else HandleOnScroll( event ); +#endif #if wxUSE_GENERIC_LIST_EXTENSIONS diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index ca8c9ab26f..99a4b4e7e6 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -52,8 +52,6 @@ #include "wx/textfile.h" #include "wx/statline.h" -#if wxUSE_LOG - #ifdef __WXMSW__ // for OutputDebugString() #include "wx/msw/private.h" diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index 59e2e0a856..ca651c8b61 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -144,10 +144,12 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi { wxSize newSize = size; int border = (style & wxNO_BORDER) ? 4 : 10; - if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border; - if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border; + if (newSize.x == -1) + newSize.x = m_bmpNormal.GetWidth()+border; + if (newSize.y == -1) + newSize.y = m_bmpNormal.GetHeight()+border; SetSize( newSize.x, newSize.y ); - SetBitmap(); + OnSetBitmap(); } gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", @@ -198,21 +200,21 @@ wxString wxBitmapButton::GetLabel() const void wxBitmapButton::ApplyWidgetStyle() { if (GTK_BUTTON(m_widget)->child == NULL) return; - + wxButton::ApplyWidgetStyle(); } -void wxBitmapButton::SetBitmap() +void wxBitmapButton::OnSetBitmap() { wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); wxBitmap the_one; if (!m_isEnabled) - the_one = m_disabled; + the_one = m_bmpDisabled; else if (m_isSelected) - the_one = m_selected; + the_one = m_bmpSelected; else if (m_hasFocus) - the_one = m_focus; + the_one = m_bmpFocus; else { if (m_isSelected) @@ -236,56 +238,25 @@ void wxBitmapButton::SetBitmap() GtkButton *bin = GTK_BUTTON(m_widget); if (bin->child == NULL) - { // initial bitmap + { + // initial bitmap GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); gtk_widget_show(pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap); - } - else + } + else { // subsequent bitmaps GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child); gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); } } -void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_disabled = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_focus = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_bitmap = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_selected = bitmap; - - SetBitmap(); -} - bool wxBitmapButton::Enable( bool enable ) { if ( !wxWindow::Enable(enable) ) return FALSE; - SetBitmap(); + OnSetBitmap(); return TRUE; } @@ -293,25 +264,25 @@ bool wxBitmapButton::Enable( bool enable ) void wxBitmapButton::HasFocus() { m_hasFocus = TRUE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::NotFocus() { m_hasFocus = FALSE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::StartSelect() { m_isSelected = TRUE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::EndSelect() { m_isSelected = FALSE; - SetBitmap(); + OnSetBitmap(); } #endif // wxUSE_BMPBUTTON diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index e291346283..f47bb99b30 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -342,16 +342,6 @@ int wxNotebook::GetSelection() const return m_selection; } -int wxNotebook::GetPageCount() const -{ - return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children ); -} - -int wxNotebook::GetRowCount() const -{ - return 1; -} - wxString wxNotebook::GetPageText( int page ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 2c4be00d6d..5c11a0acf3 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -87,6 +87,7 @@ wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData) m_region = regCopy; #endif +#if OLDCODE wxNode *node = refData.m_rects.First(); while (node) { @@ -94,6 +95,7 @@ wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData) m_rects.Append( (wxObject*) new wxRect(*r) ); node = node->Next(); } +#endif } wxRegionRefData::~wxRegionRefData() @@ -117,8 +119,6 @@ wxRegionRefData::~wxRegionRefData() #define M_REGIONDATA ((wxRegionRefData *)m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); - wxRegion::wxRegion() { } @@ -566,8 +566,6 @@ wxList *wxRegion::GetRectList() const #if OLDCODE -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - wxRegionIterator::wxRegionIterator() { Reset(); @@ -701,8 +699,6 @@ void wxRIRefData::CreateRects( const wxRegion& region ) } } -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - wxRegionIterator::wxRegionIterator() { m_refData = new wxRIRefData(); diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index 59e2e0a856..ca651c8b61 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -144,10 +144,12 @@ bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi { wxSize newSize = size; int border = (style & wxNO_BORDER) ? 4 : 10; - if (newSize.x == -1) newSize.x = m_bitmap.GetWidth()+border; - if (newSize.y == -1) newSize.y = m_bitmap.GetHeight()+border; + if (newSize.x == -1) + newSize.x = m_bmpNormal.GetWidth()+border; + if (newSize.y == -1) + newSize.y = m_bmpNormal.GetHeight()+border; SetSize( newSize.x, newSize.y ); - SetBitmap(); + OnSetBitmap(); } gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", @@ -198,21 +200,21 @@ wxString wxBitmapButton::GetLabel() const void wxBitmapButton::ApplyWidgetStyle() { if (GTK_BUTTON(m_widget)->child == NULL) return; - + wxButton::ApplyWidgetStyle(); } -void wxBitmapButton::SetBitmap() +void wxBitmapButton::OnSetBitmap() { wxCHECK_RET( m_widget != NULL, wxT("invalid bitmap button") ); wxBitmap the_one; if (!m_isEnabled) - the_one = m_disabled; + the_one = m_bmpDisabled; else if (m_isSelected) - the_one = m_selected; + the_one = m_bmpSelected; else if (m_hasFocus) - the_one = m_focus; + the_one = m_bmpFocus; else { if (m_isSelected) @@ -236,56 +238,25 @@ void wxBitmapButton::SetBitmap() GtkButton *bin = GTK_BUTTON(m_widget); if (bin->child == NULL) - { // initial bitmap + { + // initial bitmap GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); gtk_widget_show(pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap); - } - else + } + else { // subsequent bitmaps GtkPixmap *g_pixmap = GTK_PIXMAP(bin->child); gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); } } -void wxBitmapButton::SetBitmapDisabled( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_disabled = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapFocus( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_focus = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_bitmap = bitmap; - - SetBitmap(); -} - -void wxBitmapButton::SetBitmapSelected( const wxBitmap& bitmap ) -{ - if (!bitmap.Ok()) return; - m_selected = bitmap; - - SetBitmap(); -} - bool wxBitmapButton::Enable( bool enable ) { if ( !wxWindow::Enable(enable) ) return FALSE; - SetBitmap(); + OnSetBitmap(); return TRUE; } @@ -293,25 +264,25 @@ bool wxBitmapButton::Enable( bool enable ) void wxBitmapButton::HasFocus() { m_hasFocus = TRUE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::NotFocus() { m_hasFocus = FALSE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::StartSelect() { m_isSelected = TRUE; - SetBitmap(); + OnSetBitmap(); } void wxBitmapButton::EndSelect() { m_isSelected = FALSE; - SetBitmap(); + OnSetBitmap(); } #endif // wxUSE_BMPBUTTON diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index e291346283..f47bb99b30 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -342,16 +342,6 @@ int wxNotebook::GetSelection() const return m_selection; } -int wxNotebook::GetPageCount() const -{ - return (int) g_list_length( GTK_NOTEBOOK(m_widget)->children ); -} - -int wxNotebook::GetRowCount() const -{ - return 1; -} - wxString wxNotebook::GetPageText( int page ) const { wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid notebook") ); diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 2c4be00d6d..5c11a0acf3 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -87,6 +87,7 @@ wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData) m_region = regCopy; #endif +#if OLDCODE wxNode *node = refData.m_rects.First(); while (node) { @@ -94,6 +95,7 @@ wxRegionRefData::wxRegionRefData(const wxRegionRefData& refData) m_rects.Append( (wxObject*) new wxRect(*r) ); node = node->Next(); } +#endif } wxRegionRefData::~wxRegionRefData() @@ -117,8 +119,6 @@ wxRegionRefData::~wxRegionRefData() #define M_REGIONDATA ((wxRegionRefData *)m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); - wxRegion::wxRegion() { } @@ -566,8 +566,6 @@ wxList *wxRegion::GetRectList() const #if OLDCODE -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - wxRegionIterator::wxRegionIterator() { Reset(); @@ -701,8 +699,6 @@ void wxRIRefData::CreateRects( const wxRegion& region ) } } -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); - wxRegionIterator::wxRegionIterator() { m_refData = new wxRIRefData(); -- 2.47.2