Applied patch to correct EVT-CHAR

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

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index bd8fa401a707a57dce9f47222ba24deabe0fe844..560a55b51471f1e1f4b190a3c7c8ec49107821ff 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -16,7 +16,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "window.h"
 #endif
 
     #pragma implementation "window.h"
 #endif
 


@@ -524,7 +524,6 @@ static ibool MGLAPI wxWindowKeybHandler(window_t *wnd, event_t *e)
 IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase)
 
 BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase)
 IMPLEMENT_ABSTRACT_CLASS(wxWindowMGL, wxWindowBase)
 
 BEGIN_EVENT_TABLE(wxWindowMGL, wxWindowBase)

-    EVT_IDLE(wxWindowMGL::OnIdle)

 END_EVENT_TABLE()
 
 // ===========================================================================
 END_EVENT_TABLE()
 
 // ===========================================================================


@@ -535,7 +534,7 @@ END_EVENT_TABLE()
 // constructors and such
 // ----------------------------------------------------------------------------
 
 // constructors and such
 // ----------------------------------------------------------------------------
 

-extern wxDisplayModeInfo wxGetDefaultDisplayMode();
+extern wxVideoMode wxGetDefaultDisplayMode();

 
 void wxWindowMGL::Init()
 {
 
 void wxWindowMGL::Init()
 {


@@ -547,14 +546,9 @@ void wxWindowMGL::Init()
             wxLogFatalError(_("Cannot initialize display."));
     }
 
             wxLogFatalError(_("Cannot initialize display."));
     }
 

-    // generic:
-    InitBase();
-

     // mgl specific:
     m_wnd = NULL;
     m_isShown = TRUE;
     // mgl specific:
     m_wnd = NULL;
     m_isShown = TRUE;

-    m_isBeingDeleted = FALSE;
-    m_isEnabled = TRUE;

     m_frozen = FALSE;
     m_paintMGLDC = NULL;
     m_eraseBackground = -1;
     m_frozen = FALSE;
     m_paintMGLDC = NULL;
     m_eraseBackground = -1;


@@ -592,14 +586,8 @@ wxWindowMGL::~wxWindowMGL()
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;
 
     if ( gs_windowUnderMouse == this )
         gs_windowUnderMouse = NULL;
 

-    // VS: destroy children first and _then_ detach *this from its parent.
-    //     If we'd do it the other way around, children wouldn't be able
-    //     find their parent frame (see above).

     DestroyChildren();
 
     DestroyChildren();
 

-    if ( m_parent )
-        m_parent->RemoveChild(this);
-

     if ( m_wnd )
         MGL_wmDestroyWindow(m_wnd);
 }
     if ( m_wnd )
         MGL_wmDestroyWindow(m_wnd);
 }


@@ -631,7 +619,7 @@ bool wxWindowMGL::Create(wxWindow *parent,
     long mgl_style = 0;
     window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
 
     long mgl_style = 0;
     window_t *wnd_parent = parent ? parent->GetHandle() : NULL;
 

-    if ( !(style & wxNO_FULL_REPAINT_ON_RESIZE) )
+    if ( style & wxFULL_REPAINT_ON_RESIZE )

     {
         mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
     }
     {
         mgl_style |= MGL_WM_FULL_REPAINT_ON_RESIZE;
     }


@@ -754,7 +742,7 @@ void wxWindowMGL::KillFocus()
 // this wxWindowBase function is implemented here (in platform-specific file)
 // because it is static and so couldn't be made virtual
 // ----------------------------------------------------------------------------
 // this wxWindowBase function is implemented here (in platform-specific file)
 // because it is static and so couldn't be made virtual
 // ----------------------------------------------------------------------------

-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()

 {
     return (wxWindow*)gs_focusedWindow;
 }
 {
     return (wxWindow*)gs_focusedWindow;
 }


@@ -856,37 +844,6 @@ void wxWindowMGL::WarpPointer(int x, int y)
     EVT_setMousePos(x, y);
 }
 
     EVT_setMousePos(x, y);
 }
 

-#if WXWIN_COMPATIBILITY
-// If nothing defined for this, try the parent.
-// E.g. we may be a button loaded from a resource, with no callback function
-// defined.
-void wxWindowMGL::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-    if ( GetEventHandler()->ProcessEvent(event)  )
-        return;
-    if ( m_parent )
-        m_parent->GetEventHandler()->OnCommand(win, event);
-}
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY
-wxObject* wxWindowMGL::GetChild(int number) const
-{
-    // Return a pointer to the Nth object in the Panel
-    wxNode *node = GetChildren().First();
-    int n = number;
-    while (node && n--)
-        node = node->Next();
-    if ( node )
-    {
-        wxObject *obj = (wxObject *)node->Data();
-        return(obj);
-    }
-    else
-        return NULL;
-}
-#endif // WXWIN_COMPATIBILITY
-

 // Set this window to be the child of 'parent'.
 bool wxWindowMGL::Reparent(wxWindowBase *parent)
 {
 // Set this window to be the child of 'parent'.
 bool wxWindowMGL::Reparent(wxWindowBase *parent)
 {


@@ -1104,48 +1061,6 @@ void wxWindowMGL::GetTextExtent(const wxString& string,
     dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
 }
 
     dc.GetTextExtent(string, x, y, descent, externalLeading, (wxFont*)theFont);
 }
 

-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowMGL::CreateCaret(int w, int h)
-{
-    SetCaret(new wxCaret(this, w, h));
-}
-
-void wxWindowMGL::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
-{
-    wxFAIL_MSG("not implemented");
-}
-
-void wxWindowMGL::ShowCaret(bool show)
-{
-    wxCHECK_RET( m_caret, "no caret to show" );
-
-    m_caret->Show(show);
-}
-
-void wxWindowMGL::DestroyCaret()
-{
-    SetCaret(NULL);
-}
-
-void wxWindowMGL::SetCaretPos(int x, int y)
-{
-    wxCHECK_RET( m_caret, "no caret to move" );
-
-    m_caret->Move(x, y);
-}
-
-void wxWindowMGL::GetCaretPos(int *x, int *y) const
-{
-    wxCHECK_RET( m_caret, "no caret to get position of" );
-
-    m_caret->GetPosition(x, y);
-}
-#endif // wxUSE_CARET
-

 
 // ---------------------------------------------------------------------------
 // painting
 
 // ---------------------------------------------------------------------------
 // painting


@@ -1276,8 +1191,8 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 // idle events processing
 // ---------------------------------------------------------------------------
 
 // idle events processing
 // ---------------------------------------------------------------------------
 

-void wxWindowMGL::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxWindowMGL::OnInternalIdle()

 {
 {

-    if (wxUpdateUIEvent::CanUpdate())
-        UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 }