fixed problem in mimetype database and put a temp. fix for font tags

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

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index f7ed6cb2bb455037f1c9c3b600e6d7e9850d6d15..cebde640e5b2f0278520b42de27c373d7c4d8b72 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -117,9 +117,9 @@ static int str16len(const char *s)
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARY
 // ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARY

-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)

 
 

-    BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
+    BEGIN_EVENT_TABLE(wxWindow, wxWindowBase)

         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
         EVT_IDLE(wxWindow::OnIdle)
     END_EVENT_TABLE()
         EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
         EVT_IDLE(wxWindow::OnIdle)
     END_EVENT_TABLE()


@@ -1384,12 +1384,12 @@ void wxWindow::GetTextExtent(const wxString& string,
         fontToUse = (wxFont *) & m_font;
 
     wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );
         fontToUse = (wxFont *) & m_font;
 
     wxCHECK_RET( fontToUse->Ok(), "valid window font needed" );

-
+    

     WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
 
     int direction, ascent, descent2;
     XCharStruct overall;
     WXFontStructPtr pFontStruct = theFont->GetFontStruct(1.0, GetXDisplay());
 
     int direction, ascent, descent2;
     XCharStruct overall;

-    int slen;
+    int slen = string.Len();

 
 #if 0
     if (use16)
 
 #if 0
     if (use16)


@@ -1408,6 +1408,7 @@ void wxWindow::GetTextExtent(const wxString& string,
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;
         *descent = descent2;
     if (externalLeading)
         *externalLeading = 0;

+

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1839,22 +1840,14 @@ static void wxCanvasRepaintProc(Widget drawingArea,
     {
     case Expose:
         {
     {
     case Expose:
         {

+            win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
+                               event->xexpose.width, event->xexpose.height);
+            

             if (event -> xexpose.count == 0)
             {
             if (event -> xexpose.count == 0)
             {

-#if 0
-                wxPaintEvent event(win->GetId());
-                event.SetEventObject(win);
-                win->GetEventHandler()->ProcessEvent(event);
-#endif // 0
-

                 win->DoPaint();
                 win->ClearUpdateRects();
             }
                 win->DoPaint();
                 win->ClearUpdateRects();
             }

-            else
-            {
-                win->AddUpdateRect(event->xexpose.x, event->xexpose.y,
-                                   event->xexpose.width, event->xexpose.height);
-            }

             break;
         }
     }
             break;
         }
     }