msg boxes now have icons

[wxWidgets.git] / src / stubs / window.cpp

diff --git a/src/stubs/window.cpp b/src/stubs/window.cpp
index 10ec3976dd283405badbaea6bddbe998945603a2..6970db0614bbfba50fd3f20362a12d788452c6aa 100644 (file)
--- a/src/stubs/window.cpp
+++ b/src/stubs/window.cpp
@@ -44,6 +44,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_CHAR(wxWindow::OnChar)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_CHAR(wxWindow::OnChar)

+  EVT_KEY_DOWN(wxWindow::OnKeyDown)
+  EVT_KEY_UP(wxWindow::OnKeyUp)

   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)
   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)


@@ -57,6 +59,7 @@ END_EVENT_TABLE()
 wxWindow::wxWindow()
 {
     // Generic
 wxWindow::wxWindow()
 {
     // Generic

+    m_isWindow = TRUE; // An optimization

     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;


@@ -144,6 +147,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     // Generic
            const wxString& name)
 {
     // Generic

+    m_isWindow = TRUE; // An optimization

     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;


@@ -551,6 +555,7 @@ void wxWindow::SetFont(const wxFont& font)
 
 void wxWindow::OnChar(wxKeyEvent& event)
 {
 
 void wxWindow::OnChar(wxKeyEvent& event)
 {

+/* ??

     if ( event.KeyCode() == WXK_TAB ) {
         // propagate the TABs to the parent - it's up to it to decide what
         // to do with it
     if ( event.KeyCode() == WXK_TAB ) {
         // propagate the TABs to the parent - it's up to it to decide what
         // to do with it


@@ -559,6 +564,18 @@ void wxWindow::OnChar(wxKeyEvent& event)
                 return;
         }
     }
                 return;
         }
     }

+*/
+    Default();
+}
+
+void wxWindow::OnKeyDown(wxKeyEvent& event)
+{
+    Default();
+}
+
+void wxWindow::OnKeyUp(wxKeyEvent& event)
+{
+    Default();

 }
 
 void wxWindow::OnPaint(wxPaintEvent& event)
 }
 
 void wxWindow::OnPaint(wxPaintEvent& event)


@@ -1110,7 +1127,10 @@ bool wxWindow::Close(bool force)
 {
   wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
   event.SetEventObject(this);
 {
   wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
   event.SetEventObject(this);

+#if WXWIN_COMPATIBILITY

   event.SetForce(force);
   event.SetForce(force);

+#endif
+  event.SetCanVeto(!force);

 
   return GetEventHandler()->ProcessEvent(event);
 }
 
   return GetEventHandler()->ProcessEvent(event);
 }


@@ -1278,6 +1298,11 @@ bool wxWindow::IsExposed(const wxRect& rect) const
     return (m_updateRegion.Contains(rect) != wxOutRegion);
 }
 
     return (m_updateRegion.Contains(rect) != wxOutRegion);
 }
 

+void wxWindow::SetToolTip(const wxString& tooltip)
+{
+    // TODO
+}
+

 /*
  * Allocates control IDs
  */
 /*
  * Allocates control IDs
  */