Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes - wxGTK compiles but not links

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 21:29:16 +00:00
parent 21aeca5e54
commit 29149a6491
13 changed files with 80 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/bmpbuttn.h
View File

@@ -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
/////////////////////////////////////////////////////////////////////////////
@@ -57,7 +57,6 @@ public:
void NotFocus();
void StartSelect();
void EndSelect();
void SetBitmap();
void ApplyWidgetStyle();
bool m_hasFocus;

5
include/wx/gtk1/bmpbuttn.h
View File

@@ -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
/////////////////////////////////////////////////////////////////////////////
@@ -57,7 +57,6 @@ public:
void NotFocus();
void StartSelect();
void EndSelect();
void SetBitmap();
void ApplyWidgetStyle();
bool m_hasFocus;

5
src/generic/listctrl.cpp
View File

@@ -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

2
src/generic/logg.cpp
View File

@@ -52,8 +52,6 @@
#include "wx/textfile.h"
#include "wx/statline.h"
#if wxUSE_LOG
#ifdef __WXMSW__
// for OutputDebugString()
#include "wx/msw/private.h"

61
src/gtk/bmpbuttn.cpp
View File

@@ -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",
@@ -202,17 +204,17 @@ void wxBitmapButton::ApplyWidgetStyle()
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,7 +238,8 @@ 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);
@@ -248,44 +251,12 @@ void wxBitmapButton::SetBitmap()
}
}
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

10
src/gtk/notebook.cpp
View File

@@ -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") );

8
src/gtk/region.cpp
View File

@@ -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();

61
src/gtk1/bmpbuttn.cpp
View File

@@ -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",
@@ -202,17 +204,17 @@ void wxBitmapButton::ApplyWidgetStyle()
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,7 +238,8 @@ 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);
@@ -248,44 +251,12 @@ void wxBitmapButton::SetBitmap()
}
}
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

10
src/gtk1/notebook.cpp
View File

@@ -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") );

8
src/gtk1/region.cpp
View File

@@ -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();