a minor problem left.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@507
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
- * Revision 1.1 1998/06/29 12:44:36 KB
- * Added my wxWindows based layout engine to the repository.
- * It arranges text and graphics for display on a wxDC.
- * This code is licensed under the LGPL.
+ * Revision 1.2 1998/08/12 08:33:23 KB
+ * Cursor and insert/delete work much better now, code streamlined, still
+ * a minor problem left.
+ *
+ * Revision 1.6 1998/07/08 11:56:56 KB
+ * M compiles and runs on Solaris 2.5/gcc 2.8/c-client gso
+ *
+ * Revision 1.5 1998/06/27 20:07:18 KB
+ * several bug fixes for kbList
+ * started adding my layout stuff
*
* Revision 1.1.1.1 1998/06/13 21:51:12 karsten
* initial code
*
* Revision 1.1.1.1 1998/06/13 21:51:12 karsten
* initial code
# pragma implementation "kbList.h"
#endif
# pragma implementation "kbList.h"
#endif
+#ifdef M_BASEDIR
+# include "Mconfig.h"
+#endif
kbListNode::kbListNode( void *ielement,
kbListNode *iprev,
kbListNode::kbListNode( void *ielement,
kbListNode *iprev,
else if(i.Node() == first)
{
push_front(element);
else if(i.Node() == first)
{
push_front(element);
- return;
- }
- else if(i.Node() == last)
- {
- push_back(element);
return;
}
i = kbList::iterator(new kbListNode(element, i.Node()->prev, i.Node()));
return;
}
i = kbList::iterator(new kbListNode(element, i.Node()->prev, i.Node()));
* (C) 1998 by Karsten Ballüder (Ballueder@usa.net) *
* *
* $Id$
* (C) 1998 by Karsten Ballüder (Ballueder@usa.net) *
* *
* $Id$
- * $Log$
- * Revision 1.1 1998/06/29 12:44:36 KB
- * Added my wxWindows based layout engine to the repository.
- * It arranges text and graphics for display on a wxDC.
- * This code is licensed under the LGPL.
- *
- * Revision 1.6 1998/06/27 20:06:10 KB
- * Added my layout code.
*
*******************************************************************/
*
*******************************************************************/
bool empty(void) const
{ return first == NULL ; }
bool empty(void) const
{ return first == NULL ; }
/// if true, list owns entries
bool ownsEntries;
/// pointer to first element in list
/// if true, list owns entries
bool ownsEntries;
/// pointer to first element in list
/// pointer to last element in list
kbListNode *last;
/// pointer to last element in list
kbListNode *last;
/// forbid copy construction
kbList(kbList const &foo);
/// forbid assignments
/// forbid copy construction
kbList(kbList const &foo);
/// forbid assignments
/* the cast is needed for MS VC++ 5.0 */ \
{ return (type *)((kbList::iterator *)this)->operator*() ; } \
}; \
/* the cast is needed for MS VC++ 5.0 */ \
{ return (type *)((kbList::iterator *)this)->operator*() ; } \
}; \
- inline name(bool ownsEntriesFlag = true) \
+ inline name(bool ownsEntriesFlag = FALSE) \
: kbList(ownsEntriesFlag) {} \
\
inline void push_back(type *element) \
: kbList(ownsEntriesFlag) {} \
\
inline void push_back(type *element) \
inline void insert(iterator & i, type *element) \
{ kbList::insert(i, (void *) element); } \
\
inline void insert(iterator & i, type *element) \
{ kbList::insert(i, (void *) element); } \
\
- void erase(iterator & i) \
+ inline void erase(iterator & i) \
{ kbList::erase(i); } \
\
inline iterator begin(void) const \
{ kbList::erase(i); } \
\
inline iterator begin(void) const \
\
inline iterator tail(void) const \
{ return kbList::tail(); } \
\
inline iterator tail(void) const \
{ return kbList::tail(); } \
+ ~name() \
+ { \
+ kbListNode *next; \
+ while ( first != NULL ) \
+ { \
+ next = first->next; \
+ if(ownsEntries) \
+ delete typecast(first->element); \
+ delete first; \
+ first = next; \
+ } \
+ } \
+ private: \
+ inline type * typecast(void *ptr) \
+ { return (type *) ptr; } \
+ }
#ifdef MCONFIG_H
/// define the most commonly used list type once:
#ifdef MCONFIG_H
/// define the most commonly used list type once:
//-----------------------------------------------------------------------------
enum ids{ ID_EDIT = 1, ID_ADD_SAMPLE, ID_CLEAR, ID_PRINT, ID_DPRINT,
//-----------------------------------------------------------------------------
enum ids{ ID_EDIT = 1, ID_ADD_SAMPLE, ID_CLEAR, ID_PRINT, ID_DPRINT,
- ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT };
+ ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT, ID_TEST };
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
file_menu->Append( ID_DPRINT, "Direct Print");
file_menu->Append( ID_TEXT, "Export Text");
file_menu->Append( ID_HTML, "Export HTML");
file_menu->Append( ID_DPRINT, "Direct Print");
file_menu->Append( ID_TEXT, "Export Text");
file_menu->Append( ID_HTML, "Export HTML");
+ file_menu->Append( ID_TEST, "Test");
file_menu->Append( ID_QUIT, "Exit");
wxMenuBar *menu_bar = new wxMenuBar();
file_menu->Append( ID_QUIT, "Exit");
wxMenuBar *menu_bar = new wxMenuBar();
case ID_CLICK:
cerr << "Received click event." << endl;
break;
case ID_CLICK:
cerr << "Received click event." << endl;
break;
+ case ID_TEST:
+ {
+ Clear();
+ m_lwin->GetLayoutList().LineBreak();
+ m_lwin->GetLayoutList().Insert("abc");
+ m_lwin->GetLayoutList().LineBreak();
+ m_lwin->GetLayoutList().Insert("def");
+ break;
+ }
case ID_HTML:
{
wxLayoutExportObject *export;
case ID_HTML:
{
wxLayoutExportObject *export;
#pragma implementation "wxllist.h"
#endif
#pragma implementation "wxllist.h"
#endif
+// these two lines are for use in M:
+//#include "Mpch.h"
+//#include "gui/wxllist.h"
+
-#include <wx/dc.h>
-#include <wx/postscrp.h>
-#include <wx/print.h>
+#ifndef USE_PCH
+# include "iostream.h"
+
+# include <wx/dc.h>
+# include <wx/postscrp.h>
+# include <wx/print.h>
+#endif
#define BASELINESTRETCH 12
#define BASELINESTRETCH 12
<< GetSize(&bl).y << " bl=" << bl;
}
<< GetSize(&bl).y << " bl=" << bl;
}
-# define VAR(x) cerr << #x"=" << x << endl;
-# define DBG_POINT(p) cerr << #p << ": " << p.x << ',' << p.y << endl
-# define TRACE(f) cerr << #f":" << endl;
+# define WXL_VAR(x) cerr << #x"=" << x << endl;
+# define WXL_DBG_POINT(p) cerr << #p << ": " << p.x << ',' << p.y << endl
+# define WXL_TRACE(f) cerr << #f":" << endl;
-# define VAR(x)
-# define DBG_POINT(p)
-# define TRACE(f)
+# define WXL_VAR(x)
+# define WXL_DBG_POINT(p)
+# define WXL_TRACE(f)
#endif
//-------------------------- wxLayoutObjectText
#endif
//-------------------------- wxLayoutObjectText
//-------------------------- wxLayoutObjectIcon
wxLayoutObjectIcon::wxLayoutObjectIcon(wxIcon *icon)
//-------------------------- wxLayoutObjectIcon
wxLayoutObjectIcon::wxLayoutObjectIcon(wxIcon *icon)
if(size != -1) m_FontPtSize = size;
if(style != -1) m_FontStyle = style;
if(weight != -1) m_FontWeight = weight;
if(size != -1) m_FontPtSize = size;
if(style != -1) m_FontStyle = style;
if(weight != -1) m_FontWeight = weight;
- if(underline != -1) m_FontUnderline = underline;
+ if(underline != -1) m_FontUnderline = underline != 0;
if(fg != NULL) m_ColourFG = fg;
if(bg != NULL) m_ColourBG = bg;
if(fg != NULL) m_ColourFG = fg;
if(bg != NULL) m_ColourBG = bg;
CoordType baseLine = m_FontPtSize;
CoordType baseLineSkip = (BASELINESTRETCH * baseLine)/10;
CoordType baseLine = m_FontPtSize;
CoordType baseLineSkip = (BASELINESTRETCH * baseLine)/10;
+ // where to draw the cursor
+ wxPoint cursorPosition, cursorSize;
+
// we trace the objects' cursor positions so we can draw the cursor
wxPoint cursor = wxPoint(0,0);
// the cursor position inside the object
// we trace the objects' cursor positions so we can draw the cursor
wxPoint cursor = wxPoint(0,0);
// the cursor position inside the object
#endif
dc.IsKindOf(CLASSINFO(wxPostScriptDC)))
{
#endif
dc.IsKindOf(CLASSINFO(wxPostScriptDC)))
{
- VAR(wxThePrintSetupData);
+ WXL_VAR(wxThePrintSetupData);
dc.GetSize(&pageWidth, &pageHeight);
dc.StartDoc(_("Printing..."));
dc.GetSize(&pageWidth, &pageHeight);
dc.StartDoc(_("Printing..."));
position.y = margins.right;
position.x = margins.left;
position.y = margins.right;
position.x = margins.left;
- VAR(findObject); VAR(findCoords.x); VAR(findCoords.y);
+ WXL_VAR(findObject); WXL_VAR(findCoords.x); WXL_VAR(findCoords.y);
// if the cursorobject is a cmd, we need to find the first
// printable object:
while(cursorObject != end()
// if the cursorobject is a cmd, we need to find the first
// printable object:
while(cursorObject != end()
long descent = 0l; long width, height;
tobj = (wxLayoutObjectText *)*i;
String str = tobj->GetText();
long descent = 0l; long width, height;
tobj = (wxLayoutObjectText *)*i;
String str = tobj->GetText();
- VAR(m_CursorPosition.x); VAR(cursor.x);
+ WXL_VAR(m_CursorPosition.x); WXL_VAR(cursor.x);
str = str.substr(0, cursorOffset);
str = str.substr(0, cursorOffset);
dc.GetTextExtent(Str(str), &width,&height, &descent);
dc.GetTextExtent(Str(str), &width,&height, &descent);
- VAR(height);
- VAR(width); VAR(descent);
- if(width < 1) width = 1;
- dc.DrawLine(position.x+width,
- position.y+(baseLineSkip-height),
- position.x+width, position.y+baseLineSkip);
+ WXL_VAR(height);
+ WXL_VAR(width);
+ WXL_VAR(descent);
+ cursorPosition = wxPoint(position.x+width,
+ position.y+(baseLineSkip-height));
+ cursorSize = wxPoint(1, height);
+ //dc.DrawLine(position.x+width,
+ // position.y+(baseLineSkip-height),
+ // position.x+width, position.y+baseLineSkip);
}
else
{
if(type == WXLO_TYPE_LINEBREAK)
}
else
{
if(type == WXLO_TYPE_LINEBREAK)
- dc.DrawLine(0, position.y+baseLineSkip, 0, position.y+2*baseLineSkip);
+ //dc.DrawLine(0, position.y+baseLineSkip, 0, position.y+2*baseLineSkip);
+ {
+ cursorPosition = wxPoint(0, position.y);
+ cursorSize = wxPoint(1,baseLineSkip);
+ }
- if(size.x == 0)
- {
- if(size.y == 0)
- dc.DrawLine(position.x, position.y, position.x, position.y+baseLineSkip);
- else
- dc.DrawLine(position.x, position.y, position.x, position.y+size.y);
- }
- else
- dc.DrawRectangle(position.x, position.y, size.x, size.y);
+ cursorPosition = wxPoint(position.x, position.y);
+ cursorSize = wxPoint(size.x > 0 ? size.x : 1,size.y > 0 ? size.y : baseLineSkip);
+ // draw the cursor
+ if(m_Editable)
+ {
+ dc.DrawRectangle(cursorPosition.x, cursorPosition.y,
+ cursorSize.x, cursorSize.y);
+ }
m_MaxY = position.y;
return foundObject;
}
m_MaxY = position.y;
return foundObject;
}
// don't change this, I know how to optimise this and will do it real
// soon (KB)
// don't change this, I know how to optimise this and will do it real
// soon (KB)
+/*
+ * FindObjectCursor:
+ * Finds the object belonging to a given cursor position cpos and
+ * returns an iterator to that object and stores the relative cursor
+ * position in offset.
+ *
+ * For linebreaks, the offset can be 0=before or 1=after.
+ *
+ * If the cpos coordinates don't exist, they are modified.
+ */
+
wxLayoutObjectList::iterator
wxLayoutObjectList::iterator
-wxLayoutList::FindObjectCursor(wxPoint const &cpos, CoordType *offset)
+wxLayoutList::FindObjectCursor(wxPoint *cpos, CoordType *offset)
- wxPoint cursor = wxPoint(0,0); // runs along the objects
+ wxPoint object = wxPoint(0,0); // runs along the objects
CoordType width;
wxLayoutObjectList::iterator i;
#ifdef WXLAYOUT_DEBUG
CoordType width;
wxLayoutObjectList::iterator i;
#ifdef WXLAYOUT_DEBUG
- cerr << "Looking for object at " << cpos.x << ',' << cpos.y <<
+ cerr << "Looking for object at " << cpos->x << ',' << cpos->y <<
- for(i = begin(); i != end() && cursor.y <= cpos.y; i++)
+ for(i = begin(); i != end() && object.y <= cpos->y; i++)
- width = 0;
- if((*i)->GetType() == WXLO_TYPE_LINEBREAK)
+ width = (**i).CountPositions();
+ if(cpos->y == object.y) // a possible candidate
- if(cpos.y == cursor.y && i != begin())
+ if((**i).GetType() ==WXLO_TYPE_LINEBREAK)
- --i;
- if(offset) *offset = i != end() ? (*i)->CountPositions() : 0;
+ if(cpos->x == object.x)
+ {
+ *offset = 0;
+ return i;
+ }
+ *offset=1;
+ cpos->x = object.x;
+ return i;
+ }
+ if(cpos->x >= object.x && cpos->x <= object.x+width) // overlap
+ {
+ if(offset) *offset = cpos->x-object.x;
+#ifdef WXLAYOUT_DEBUG
+ cerr << " found object at " << object.x << ',' <<
+ object.y << ", type:" << _t[(*i)->GetType()] <<endl;
+#endif
- cursor.x = 0; cursor.y ++;
- else
- cursor.x += (width = (*i)->CountPositions());
- if(cursor.y == cpos.y && (cursor.x > cpos.x ||
- ((*i)->GetType() != WXLO_TYPE_CMD && cursor.x == cpos.x))
- ) // found it ?
+ // no overlap, increment coordinates
+ object.x += width;
+ if((**i).GetType() == WXLO_TYPE_LINEBREAK)
- if(offset)
- *offset = cpos.x-(cursor.x-width); // 0==cursor before
- // the object
-#ifdef WXLAYOUT_DEBUG
- cerr << " found object at " << cursor.x-width << ',' <<
- cursor.y << ", type:" << _t[(*i)->GetType()] <<endl;
-#endif
- return i;
+ object.x = 0;
+ object.y++;
}
}
#ifdef WXLAYOUT_DEBUG
cerr << " not found" << endl;
#endif
}
}
#ifdef WXLAYOUT_DEBUG
cerr << " not found" << endl;
#endif
- return end(); // not found
+ // return last object, coordinates of that one:
+ i = tail();
+ if(i == end())
+ return i;
+ if((**i).GetType()==WXLO_TYPE_LINEBREAK)
+ {
+ if(offset)
+ *offset = (cpos.x > object.x) : 1 : 0;
+ return i;
+ }
+ cpos->x = object.x; // would be the coordinate of next object
+ cpos->y = object.y;
+ cpos->x += width; // last object's width
+ if(*offset) *offset = cpos->x-object.x
+ return i; // not found
}
wxLayoutObjectList::iterator
}
wxLayoutObjectList::iterator
{
wxLayoutObjectList::iterator obj = end();
{
wxLayoutObjectList::iterator obj = end();
- obj = FindObjectCursor(m_CursorPosition, offset);
+ obj = FindObjectCursor(&m_CursorPosition, offset);
if(obj == end()) // not ideal yet
{
obj = tail();
if(obj == end()) // not ideal yet
{
obj = tail();
void
wxLayoutList::Delete(CoordType count)
{
void
wxLayoutList::Delete(CoordType count)
{
wxLayoutObjectList::iterator i;
do
{
i = FindCurrentObject(&offs);
wxLayoutObjectList::iterator i;
do
{
i = FindCurrentObject(&offs);
+ startover: // ugly, but easiest way to do it
- return;
-#ifdef WXLAYOUT_DEBUG
- cerr << "trying to delete: " << _t[(*i)->GetType()] << endl;
-#endif
+ return; // we cannot delete anything more
+
+ /* Here we need to treat linebreaks differently.
+ If offs==0 we are before the linebreak, otherwise behind. */
if((*i)->GetType() == WXLO_TYPE_LINEBREAK)
if((*i)->GetType() == WXLO_TYPE_LINEBREAK)
- m_MaxLine--;
- if((*i)->GetType() == WXLO_TYPE_TEXT)
+ {
+ if(offs == 0)
+ {
+ m_MaxLine--;
+ erase(i);
+ count--;
+ continue; // we're done
+ }
+ else // delete the object behind the linebreak
+ {
+ i++; // we increment and continue as normal
+ offs=0;
+ goto startover;
+ }
+ }
+ else if((*i)->GetType() == WXLO_TYPE_TEXT)
{
wxLayoutObjectText *tobj = (wxLayoutObjectText *)*i;
{
wxLayoutObjectText *tobj = (wxLayoutObjectText *)*i;
- len = tobj->CountPositions();
+ CoordType len = tobj->CountPositions();
// If we find the end of a text object, this means that we
// have to delete from the object following it.
// If we find the end of a text object, this means that we
// have to delete from the object following it.
- if(i != end() && (*i)->GetType() == WXLO_TYPE_TEXT)
- {
- offs = 0; // delete from begin of next string
- tobj = (wxLayoutObjectText *)*i;
- len = tobj->CountPositions();
- }
- else
- {
- erase(i);
- return;
- }
+ offs = 0;
+ goto startover;
- if(len <= count) // delete this object
+ else if(len <= count) // delete this object
{
count -= len;
erase(i);
{
count -= len;
erase(i);
tobj->GetText().erase(offs,len);
return; // we are done
}
}
tobj->GetText().erase(offs,len);
return; // we are done
}
}
- else // delete the object
+ else // all other objects: delete the object
- len = (*i)->CountPositions();
+ CoordType len = (*i)->CountPositions();
erase(i); // after this, i is the iterator for the following object
erase(i); // after this, i is the iterator for the following object
- if(count > len)
- count -= len;
- else
- count = 0;
+ count = count > len ? count -= len : 0;
}
}
while(count && i != end());
}
}
while(count && i != end());
CoordType offs;
wxLayoutObjectList::iterator i = FindCurrentObject(&offs);
CoordType offs;
wxLayoutObjectList::iterator i = FindCurrentObject(&offs);
+ WXL_TRACE(Insert(obj));
if(i == end())
push_back(obj);
if(i == end())
push_back(obj);
- else
- {
- // do we have to split a text object?
- if((*i)->GetType() == WXLO_TYPE_TEXT && offs != 0 && offs != (*i)->CountPositions())
- {
- wxLayoutObjectText *tobj = (wxLayoutObjectText *) *i;
+ else if(offs == 0)
+ insert(i,obj);
+ // do we have to split a text object?
+ else if((*i)->GetType() == WXLO_TYPE_TEXT && offs != (*i)->CountPositions())
+ {
+ wxLayoutObjectText *tobj = (wxLayoutObjectText *) *i;
- cerr << "text: '" << tobj->GetText() << "'" << endl;
- VAR(offs);
+ cerr << "text: '" << tobj->GetText() << "'" << endl;
+ WXL_VAR(offs);
- String left = tobj->GetText().substr(0,offs); // get part before cursor
- VAR(left);
- tobj->GetText() = tobj->GetText().substr(offs,(*i)->CountPositions()-offs); // keeps the right half
- VAR(tobj->GetText());
- insert(i,obj);
- insert(i,new wxLayoutObjectText(left)); // inserts before
- }
+ String left = tobj->GetText().substr(0,offs); // get part before cursor
+ WXL_VAR(left);
+ tobj->GetText() = tobj->GetText().substr(offs,(*i)->CountPositions()-offs); // keeps the right half
+ WXL_VAR(tobj->GetText());
+ insert(i,obj);
+ insert(i,new wxLayoutObjectText(left)); // inserts before
+ }
+ else
+ {
+ // all other cases, append after object:
+ wxLayoutObjectList::iterator j = i; // we want to apend after this object
+ j++;
+ if(j != end())
+ insert(j, obj);
- {
- wxLayoutObjectList::iterator j = i; // we want to apend after this object
- j++;
- if(j != end())
- insert(j, obj);
- else
- push_back(obj);
- }
m_CursorPosition.x += obj->CountPositions();
if(obj->GetType() == WXLO_TYPE_LINEBREAK)
m_MaxLine++;
m_CursorPosition.x += obj->CountPositions();
if(obj->GetType() == WXLO_TYPE_LINEBREAK)
m_MaxLine++;
wxLayoutList::Insert(String const &text)
{
wxLayoutObjectText *tobj = NULL;
wxLayoutList::Insert(String const &text)
{
wxLayoutObjectText *tobj = NULL;
+ WXL_TRACE(Insert(text));
if(i != end() && (*i)->GetType() == WXLO_TYPE_TEXT)
{ // insert into an existing text object:
if(i != end() && (*i)->GetType() == WXLO_TYPE_TEXT)
{ // insert into an existing text object:
- TRACE(inserting into existing object);
+ WXL_TRACE(inserting into existing object);
tobj = (wxLayoutObjectText *)*i ;
wxASSERT(tobj);
tobj->GetText().insert(offs,text);
tobj = (wxLayoutObjectText *)*i ;
wxASSERT(tobj);
tobj->GetText().insert(offs,text);
{
wxLayoutObjectList::iterator j = i;
j--;
{
wxLayoutObjectList::iterator j = i;
j--;
- TRACE(checking previous object);
+ WXL_TRACE(checking previous object);
if(0 && j != end() && (*j)->GetType() == WXLO_TYPE_TEXT)
{
tobj = (wxLayoutObjectText *)*i;
if(0 && j != end() && (*j)->GetType() == WXLO_TYPE_TEXT)
{
tobj = (wxLayoutObjectText *)*i;
}
else // insert a new text object
{
}
else // insert a new text object
{
- TRACE(creating new object);
+ WXL_TRACE(creating new object);
Insert(new wxLayoutObjectText(text)); //FIXME not too optimal, slow
return; // position gets incremented in Insert(obj)
}
Insert(new wxLayoutObjectText(text)); //FIXME not too optimal, slow
return; // position gets incremented in Insert(obj)
}
// skip the following defines if embedded in M application
#ifdef M_BASEDIR
// skip the following defines if embedded in M application
#ifdef M_BASEDIR
class wxLayoutList;
class wxLayoutObjectBase;
class wxLayoutList;
class wxLayoutObjectBase;
-/// Define a list type of wxLayoutObjectBase pointers.
-KBLIST_DEFINE(wxLayoutObjectList, wxLayoutObjectBase);
+class wxDC;
+class wxColour;
+class wxFont;
/** The base class defining the interface to each object which can be
part of the layout. Each object needs to draw itself and calculate
/** The base class defining the interface to each object which can be
part of the layout. Each object needs to draw itself and calculate
+/// Define a list type of wxLayoutObjectBase pointers.
+KBLIST_DEFINE(wxLayoutObjectList, wxLayoutObjectBase);
+
+
/// object for text block
class wxLayoutObjectText : public wxLayoutObjectBase
{
/// object for text block
class wxLayoutObjectText : public wxLayoutObjectBase
{
bool draw = true);
virtual wxPoint GetSize(CoordType *baseLine) const;
wxLayoutObjectIcon(wxIcon *icon);
bool draw = true);
virtual wxPoint GetSize(CoordType *baseLine) const;
wxLayoutObjectIcon(wxIcon *icon);
};
/// for export to html:
};
/// for export to html:
bool m_Editable;
/// find the object to the cursor position and returns the offset
/// in there
bool m_Editable;
/// find the object to the cursor position and returns the offset
/// in there
- wxLayoutObjectList::iterator FindObjectCursor(wxPoint const &cpos, CoordType *offset = NULL);
+ wxLayoutObjectList::iterator FindObjectCursor(wxPoint *cpos, CoordType *offset = NULL);
: wxScrolledWindow(parent)
{
m_ScrollbarsSet = false;
: wxScrolledWindow(parent)
{
m_ScrollbarsSet = false;
}
void
wxLayoutWindow::OnMouse(wxMouseEvent& event)
{
}
void
wxLayoutWindow::OnMouse(wxMouseEvent& event)
{
- if(m_EventId == 0) // nothing to do
+ if(m_EventId == -1) // nothing to do
- // this is unintuitive
- wxClientDC dc(this);
- PrepareDC( dc );
-
- m_FindPos.x = dc.DeviceToLogicalX( event.GetX() );
- m_FindPos.y = dc.DeviceToLogicalY( event.GetY() );
-
+ m_FindPos.x = event.GetX();
+ m_FindPos.y = event.GetY();
m_FoundObject = NULL;
#ifdef WXLAYOUT_DEBUG
m_FoundObject = NULL;
#ifdef WXLAYOUT_DEBUG
Refresh();
if(m_FoundObject)
{
Refresh();
if(m_FoundObject)
{
{
wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, m_EventId);
commandEvent.SetEventObject( this );
{
wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, m_EventId);
commandEvent.SetEventObject( this );
wxPaintDC dc( this ); // only when used as OnPaint for OnDraw we
PrepareDC( dc ); // can skip the first two lines
wxPaintDC dc( this ); // only when used as OnPaint for OnDraw we
PrepareDC( dc ); // can skip the first two lines
- if(m_EventId) // look for keyclicks
+ if(m_EventId != -1) // look for keyclicks
m_FoundObject = m_llist.Draw(dc,true,m_FindPos);
else
m_llist.Draw(dc);
m_FoundObject = m_llist.Draw(dc,true,m_FindPos);
else
m_llist.Draw(dc);
# pragma interface "wxlwindow.h"
#endif
# pragma interface "wxlwindow.h"
#endif
+#ifndef USE_PCH
+# include <wx/wx.h>
+#endif
-#define BROKEN_COMPILER
-
-#ifdef BROKEN_COMPILER
-# define virtual
-#endif
-
class wxLayoutWindow : public wxScrolledWindow
{
public:
class wxLayoutWindow : public wxScrolledWindow
{
public:
SetBackgroundColour( *GetLayoutList().GetDefaults()->GetBGColour());
}
SetBackgroundColour( *GetLayoutList().GetDefaults()->GetBGColour());
}
- //virtual void OnDraw(wxDC &dc);
+ // callbacks
+ // NB: these functions are used as event handlers and must not be virtual
+ //void OnDraw(wxDC &dc);
void OnPaint(wxPaintEvent &WXUNUSED(event));
void OnPaint(wxPaintEvent &WXUNUSED(event));
- virtual void OnMouse(wxMouseEvent& event);
- virtual void OnChar(wxKeyEvent& event);
+ void OnMouse(wxMouseEvent& event);
+ void OnChar(wxKeyEvent& event);
+
+#ifdef __WXMSW__
+ virtual long MSWGetDlgCode();
+#endif //MSW
+
void UpdateScrollbars(void);
void Print(void);
void UpdateScrollbars(void);
void Print(void);
- void Erase(void)
- { m_llist.Clear(); Clear(); }
+ void Erase(void) { m_llist.Clear(); Clear(); }
void SetEventId(int id) { m_EventId = id; }
void SetEventId(int id) { m_EventId = id; }
- wxPoint const &GetClickPosition(void) const { return
- m_ClickPosition; }
- virtual ~wxLayoutWindow() {} ;
+ wxPoint const &GetClickPosition(void) const { return m_ClickPosition; }
+ virtual ~wxLayoutWindow() {}
+
private:
/// for sending events
wxWindow *m_Parent;
private:
/// for sending events
wxWindow *m_Parent;
wxPoint m_FindPos;
wxLayoutObjectBase *m_FoundObject;
wxPoint m_ClickPosition;
wxPoint m_FindPos;
wxLayoutObjectBase *m_FoundObject;
wxPoint m_ClickPosition;
-#ifdef BROKEN_COMPILER
-#undef virtual
-#endif
-
projects / wxWidgets.git / commitdiff
