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

compile fixes for EMX

Browse Source 
minor doc updates
  minor fixes for problems with rdrag and ldrag in tree ctrl and list ctrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-08-16 12:18:40 +00:00
parent c62d808272
commit fd9811b137
21 changed files with 166 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/generic/listctrl.cpp
View File

@@ -29,7 +29,7 @@
IMPLEMENT_DYNAMIC_CLASS(wxListItemData,wxObject);
wxListItemData::wxListItemData(void)
wxListItemData::wxListItemData()
{
m_image = -1;
m_data = 0;
@@ -92,12 +92,12 @@ void wxListItemData::SetColour( wxColour *col )
m_colour = col;
}
bool wxListItemData::HasImage(void) const
bool wxListItemData::HasImage() const
{
return (m_image >= 0);
}
bool wxListItemData::HasText(void) const
bool wxListItemData::HasText() const
{
return (!m_text.IsNull());
}
@@ -112,27 +112,27 @@ void wxListItemData::GetText( wxString &s )
s = m_text;
}
int wxListItemData::GetX( void ) const
int wxListItemData::GetX() const
{
return m_xpos;
}
int wxListItemData::GetY( void ) const
int wxListItemData::GetY() const
{
return m_ypos;
}
int wxListItemData::GetWidth(void) const
int wxListItemData::GetWidth() const
{
return m_width;
}
int wxListItemData::GetHeight(void) const
int wxListItemData::GetHeight() const
{
return m_height;
}
int wxListItemData::GetImage(void) const
int wxListItemData::GetImage() const
{
return m_image;
}
@@ -144,7 +144,7 @@ void wxListItemData::GetItem( wxListItem &info )
info.m_data = m_data;
}
wxColour *wxListItemData::GetColour(void)
wxColour *wxListItemData::GetColour()
{
return m_colour;
}
@@ -155,7 +155,7 @@ wxColour *wxListItemData::GetColour(void)
IMPLEMENT_DYNAMIC_CLASS(wxListHeaderData,wxObject);
wxListHeaderData::wxListHeaderData(void)
wxListHeaderData::wxListHeaderData()
{
m_mask = 0;
m_image = 0;
@@ -208,12 +208,12 @@ void wxListHeaderData::SetFormat( int format )
m_format = format;
}
bool wxListHeaderData::HasImage(void) const
bool wxListHeaderData::HasImage() const
{
return (m_image != 0);
}
bool wxListHeaderData::HasText(void) const
bool wxListHeaderData::HasText() const
{
return (m_text.Length() > 0);
}
@@ -237,17 +237,17 @@ void wxListHeaderData::GetText( wxString &s )
s = m_text;
}
int wxListHeaderData::GetImage(void) const
int wxListHeaderData::GetImage() const
{
return m_image;
}
int wxListHeaderData::GetWidth(void) const
int wxListHeaderData::GetWidth() const
{
return m_width;
}
int wxListHeaderData::GetFormat(void) const
int wxListHeaderData::GetFormat() const
{
return m_format;
}
@@ -949,7 +949,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus)
END_EVENT_TABLE()
wxListMainWindow::wxListMainWindow( void )
wxListMainWindow::wxListMainWindow()
{
m_mode = 0;
m_lines.DeleteContents( TRUE );
@@ -1014,7 +1014,7 @@ wxListMainWindow::wxListMainWindow( wxWindow *parent, wxWindowID id,
SetBackgroundColour( *wxWHITE );
}
wxListMainWindow::~wxListMainWindow( void )
wxListMainWindow::~wxListMainWindow()
{
if (m_hilightBrush) delete m_hilightBrush;
@@ -1150,7 +1150,7 @@ void wxListMainWindow::EditLabel( long item )
m_currentEdit = (wxListLineData*) node->Data();
wxListEvent le( wxEVT_COMMAND_LIST_END_LABEL_EDIT, GetParent()->GetId() );
wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, GetParent()->GetId() );
le.SetEventObject( GetParent() );
le.m_itemIndex = GetIndexOfLine( m_currentEdit );
m_currentEdit->GetItem( 0, le.m_item );
@@ -1213,6 +1213,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
if (!m_current) return;
if (m_dirty) return;
if ( !(event.Dragging() || event.ButtonDown() || event.LeftUp()) ) return;
wxClientDC dc(this);
PrepareDC(dc);
@@ -1232,23 +1233,29 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
node = node->Next();
}
if (!event.Dragging())
m_dragCount = 0;
else
m_dragCount++;
if (event.Dragging() && (m_dragCount > 3))
if (event.Dragging())
{
m_dragCount = 0;
if (m_dragCount == 0)
m_dragStart = wxPoint(x,y);
wxListEvent le( wxEVT_COMMAND_LIST_BEGIN_DRAG, GetParent()->GetId() );
m_dragCount++;
if (m_dragCount != 3) return;
int command = wxEVT_COMMAND_LIST_BEGIN_DRAG;
if (event.RightIsDown()) command = wxEVT_COMMAND_LIST_BEGIN_RDRAG;
wxListEvent le( command, GetParent()->GetId() );
le.SetEventObject( GetParent() );
le.m_pointDrag.x = x;
le.m_pointDrag.y = y;
le.m_pointDrag = m_dragStart;
GetParent()->GetEventHandler()->ProcessEvent( le );
return;
}
else
{
m_dragCount = 0;
}
if (!line) return;
@@ -2343,7 +2350,7 @@ void wxListMainWindow::SortItems( wxListCtrlCompare fn, long data )
IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
wxListItem::wxListItem(void)
wxListItem::wxListItem()
{
m_mask = 0;
m_itemId = 0;
@@ -2386,7 +2393,7 @@ BEGIN_EVENT_TABLE(wxListCtrl,wxControl)
EVT_IDLE (wxListCtrl::OnIdle)
END_EVENT_TABLE()
wxListCtrl::wxListCtrl(void)
wxListCtrl::wxListCtrl()
{
m_imageListNormal = (wxImageList *) NULL;
m_imageListSmall = (wxImageList *) NULL;
@@ -2395,7 +2402,7 @@ wxListCtrl::wxListCtrl(void)
m_headerWin = (wxListHeaderWindow*) NULL;
}
wxListCtrl::~wxListCtrl(void)
wxListCtrl::~wxListCtrl()
{
}
@@ -2531,7 +2538,7 @@ bool wxListCtrl::SetColumnWidth( int col, int width )
return TRUE;
}
int wxListCtrl::GetCountPerPage(void) const
int wxListCtrl::GetCountPerPage() const
{
return m_mainWin->GetCountPerPage(); // different from Windows ?
}
@@ -2637,12 +2644,12 @@ bool wxListCtrl::SetItemPosition( long WXUNUSED(item), const wxPoint& WXUNUSED(p
return 0;
}
int wxListCtrl::GetItemCount(void) const
int wxListCtrl::GetItemCount() const
{
return m_mainWin->GetItemCount();
}
int wxListCtrl::GetColumnCount(void) const
int wxListCtrl::GetColumnCount() const
{
return m_mainWin->GetColumnCount();
}
@@ -2657,13 +2664,13 @@ int wxListCtrl::GetItemSpacing( bool isSmall ) const
return m_mainWin->GetItemSpacing( isSmall );
}
int wxListCtrl::GetSelectedItemCount(void) const
int wxListCtrl::GetSelectedItemCount() const
{
return m_mainWin->GetSelectedItemCount();
}
/*
wxColour wxListCtrl::GetTextColour(void) const
wxColour wxListCtrl::GetTextColour() const
{
}
@@ -2672,7 +2679,7 @@ void wxListCtrl::SetTextColour(const wxColour& WXUNUSED(col))
}
*/
long wxListCtrl::GetTopItem(void) const
long wxListCtrl::GetTopItem() const
{
return 0;
}
@@ -2715,7 +2722,7 @@ bool wxListCtrl::DeleteItem( long item )
return TRUE;
}
bool wxListCtrl::DeleteAllItems(void)
bool wxListCtrl::DeleteAllItems()
{
m_mainWin->DeleteAllItems();
return TRUE;

39
src/generic/treectrl.cpp
View File

@@ -1875,8 +1875,6 @@ void wxTreeCtrl::OnRenameAccept()
void wxTreeCtrl::OnMouse( wxMouseEvent &event )
{
if (!event.LeftIsDown()) m_dragCount = 0;
if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
if ( !m_anchor ) return;
@@ -1890,25 +1888,30 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
if (item == NULL) return; /* we hit the blank area */
if (event.Dragging())
{
if (m_dragCount == 2) /* small drag latency (3?) */
{
m_dragCount = 0;
wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId());
nevent.m_item = m_current;
nevent.SetEventObject(this);
GetEventHandler()->ProcessEvent(nevent);
}
else
{
m_dragCount++;
}
return;
if (m_dragCount == 0)
m_dragStart = wxPoint(x,y);
m_dragCount++;
if (m_dragCount != 3) return;
int command = wxEVT_COMMAND_TREE_BEGIN_DRAG;
if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
wxTreeEvent nevent( command, GetId() );
nevent.m_item = m_current;
nevent.SetEventObject(this);
GetEventHandler()->ProcessEvent(nevent);
return;
}
else
{
m_dragCount = 0;
}
if (item == NULL) return; /* we hit the blank area */
if (event.LeftUp() && (item == m_current) &&
(flags & wxTREE_HITTEST_ONITEMLABEL) &&

4
src/gtk/app.cpp
View File

@@ -669,7 +669,11 @@ int wxEntry( int argc, char *argv[] )
{
gtk_set_locale();
#if wxUSE_WCHAR_T
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
#else
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
#endif
gtk_init( &argc, &argv );

2
src/gtk/menu.cpp
View File

@@ -732,6 +732,7 @@ void wxMenu::AppendSeparator()
m_items.Append( mitem );
}
#if (GTK_MINOR_VERSION > 0)
static char* GetHotKey( const wxString &hotkey, char *hotbuf )
{
if (hotkey.IsEmpty()) return (char*) NULL;
@@ -769,6 +770,7 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
}
return (char*) NULL;
}
#endif
void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{

4
src/gtk/stattext.cpp
View File

@@ -71,11 +71,11 @@ bool wxStaticText::Create(wxWindow *parent,
justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify);
#if GTK_MINOR_VERSION == 2
//#if GTK_MINOR_VERSION == 2
// GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
#endif // GTK 1.2.x
//#endif // GTK 1.2.x
GtkRequisition req;
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );

4
src/gtk1/app.cpp
View File

@@ -669,7 +669,11 @@ int wxEntry( int argc, char *argv[] )
{
gtk_set_locale();
#if wxUSE_WCHAR_T
if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
#else
if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
#endif
gtk_init( &argc, &argv );

2
src/gtk1/menu.cpp
View File

@@ -732,6 +732,7 @@ void wxMenu::AppendSeparator()
m_items.Append( mitem );
}
#if (GTK_MINOR_VERSION > 0)
static char* GetHotKey( const wxString &hotkey, char *hotbuf )
{
if (hotkey.IsEmpty()) return (char*) NULL;
@@ -769,6 +770,7 @@ static char* GetHotKey( const wxString &hotkey, char *hotbuf )
}
return (char*) NULL;
}
#endif
void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool checkable )
{

4
src/gtk1/stattext.cpp
View File

@@ -71,11 +71,11 @@ bool wxStaticText::Create(wxWindow *parent,
justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify);
#if GTK_MINOR_VERSION == 2
//#if GTK_MINOR_VERSION == 2
// GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
#endif // GTK 1.2.x
//#endif // GTK 1.2.x
GtkRequisition req;
(* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );

4
src/unix/utilsunx.cpp
View File

@@ -58,7 +58,7 @@
#if !defined(HAVE_USLEEP) && \
(defined(__SUN__) && !defined(__SunOs_5_6) && \
!defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \
defined(__osf__)
defined(__osf__) || defined(__EMX__)
extern "C"
{
#ifdef __SUN__
@@ -71,7 +71,7 @@
#ifdef __EMX__
/* I copied this from the XFree86 diffs. AV. */
extern void DosSleep(unsigned long);
//extern void DosSleep(unsigned long);
#define INCL_DOSPROCESS
#include <os2.h>
void usleep(unsigned long delay)