* wxCreateDynamicObject() uses an hashtable now

[wxWidgets.git] / user / wxLayout / wxlwindow.h

diff --git a/user/wxLayout/wxlwindow.h b/user/wxLayout/wxlwindow.h
index 86a487fc6494aa42f7b653c2143ed1ae8ee399ff..48111825df2ccbdb91785d925ffa891da7cf77a6 100644 (file)
--- a/user/wxLayout/wxlwindow.h
+++ b/user/wxLayout/wxlwindow.h
@@ -12,7 +12,9 @@
 #   pragma interface "wxlwindow.h"
 #endif
 
 #   pragma interface "wxlwindow.h"
 #endif
 

-#include   <wx/wx.h>
+#ifndef USE_PCH
+#  include   <wx/wx.h>
+#endif

 
 #include   "wxllist.h"
 
 
 #include   "wxllist.h"
 


@@ -23,17 +25,32 @@ public:
 
    wxLayoutList & GetLayoutList(void) { return m_llist; }
 
 
    wxLayoutList & GetLayoutList(void) { return m_llist; }
 

-   //virtual void OnDraw(wxDC &dc);
+   // clears the window and sets default parameters:
+   void Clear(int family = wxROMAN, int size=12, int style=wxNORMAL, int weight=wxNORMAL,
+              int underline=0, char const *fg="black", char const
+              *bg="white")
+      {
+         GetLayoutList().Clear(family,size,style,weight,underline,fg,bg);
+         SetBackgroundColour( *GetLayoutList().GetDefaults()->GetBGColour());
+      }
+
+   // 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 SetEventId(int id) { m_EventId = id; }
    void SetEventId(int id) { m_EventId = id; }

-   wxPoint const &GetClickPosition(void) const { return
-                                                    m_ClickPosition; }
+   // what for? Caller doesn't even know object's positions in window
+   //wxPoint const &GetClickPosition(void) const { return m_ClickPosition; }
+   virtual ~wxLayoutWindow() {}

 private:
    /// for sending events
    wxWindow *m_Parent;
 private:
    /// for sending events
    wxWindow *m_Parent;


@@ -46,6 +63,7 @@ private:
    wxPoint m_FindPos;
    wxLayoutObjectBase *m_FoundObject;
    wxPoint m_ClickPosition;
    wxPoint m_FindPos;
    wxLayoutObjectBase *m_FoundObject;
    wxPoint m_ClickPosition;

+

    DECLARE_EVENT_TABLE()
 };
 
    DECLARE_EVENT_TABLE()
 };