Font updates

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index a1eb5192b5d7f1a243bc7ecb72249883c1818ed0..fdfe4c3a42476139ac662e5f4dd20ef6ed8d2c61 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -105,6 +105,10 @@ bool wxApp::Initialize()
 {
     wxClassInfo::InitializeClasses();
 
 {
     wxClassInfo::InitializeClasses();
 

+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+

     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 #if wxUSE_THREADS
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 #if wxUSE_THREADS


@@ -384,21 +388,17 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";
+    // TODO: parse the command line

     argc = 0;
     argv = NULL;
     argc = 0;
     argv = NULL;

-    m_exitOnFrameDelete = TRUE;
+

     m_mainColormap = (WXColormap) NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;
     m_mainColormap = (WXColormap) NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;
     m_showIconic = FALSE;
     m_initialSize = wxDefaultSize;

-    
+

 #if !wxUSE_NANOX
     m_visualColormap = NULL;
     m_colorCube = NULL;
 #if !wxUSE_NANOX
     m_visualColormap = NULL;
     m_colorCube = NULL;


@@ -410,7 +410,7 @@ wxApp::~wxApp()
 #if !wxUSE_NANOX
     if (m_colorCube)
         free( m_colorCube );
 #if !wxUSE_NANOX
     if (m_colorCube)
         free( m_colorCube );

-        
+

     if (m_visualColormap)
         delete [] (XColor*)m_visualColormap;
 #endif
     if (m_visualColormap)
         delete [] (XColor*)m_visualColormap;
 #endif


@@ -510,7 +510,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX

-            if (event->xexpose.window != (Window)win->GetClientWindow())
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())

             {
                 XEvent tmp_event;
                 wxExposeInfo info;
             {
                 XEvent tmp_event;
                 wxExposeInfo info;


@@ -552,7 +552,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.

-                if (win->GetMainWindow() == win->GetClientWindow())
+                if (win->GetMainWindow() == win->GetClientAreaWindow())

                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.


@@ -740,7 +740,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         {
             if (!win->IsEnabled())
                 return FALSE;
         {
             if (!win->IsEnabled())
                 return FALSE;

-                
+

             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;
             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;


@@ -791,7 +791,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 #endif
                 {
                     wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
 #endif
                 {
                     wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );

-                    
+

                     extern wxWindow* g_GettingFocus;
                     if (g_GettingFocus && g_GettingFocus->GetParent() == win)
                     {
                     extern wxWindow* g_GettingFocus;
                     if (g_GettingFocus && g_GettingFocus->GetParent() == win)
                     {


@@ -1029,44 +1029,44 @@ bool wxApp::OnInitGui()
     vinfo_template.visual = xvisual;
     vinfo_template.visualid = XVisualIDFromVisual( xvisual );
     vinfo_template.depth = xdepth;
     vinfo_template.visual = xvisual;
     vinfo_template.visualid = XVisualIDFromVisual( xvisual );
     vinfo_template.depth = xdepth;

-        
+

     int nitem = 0;
     XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
     wxASSERT_MSG( vi, wxT("No visual info") );
     int nitem = 0;
     XVisualInfo *vi = XGetVisualInfo( xdisplay, VisualIDMask|VisualDepthMask, &vinfo_template, &nitem );
     wxASSERT_MSG( vi, wxT("No visual info") );

-    
+

     m_visualType = vi->visual->c_class;
     m_visualScreen = vi->screen;
     m_visualType = vi->visual->c_class;
     m_visualScreen = vi->screen;

-    
+

     m_visualRedMask = vi->red_mask;
     m_visualGreenMask = vi->green_mask;
     m_visualBlueMask = vi->blue_mask;
     m_visualRedMask = vi->red_mask;
     m_visualGreenMask = vi->green_mask;
     m_visualBlueMask = vi->blue_mask;

-    
+

     if (m_visualType != GrayScale && m_visualType != PseudoColor)
     {
         wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
         wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
         wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
     }
     if (m_visualType != GrayScale && m_visualType != PseudoColor)
     {
         wxCalcPrecAndShift( m_visualRedMask, &m_visualRedShift, &m_visualRedPrec );
         wxCalcPrecAndShift( m_visualGreenMask, &m_visualGreenShift, &m_visualGreenPrec );
         wxCalcPrecAndShift( m_visualBlueMask, &m_visualBlueShift, &m_visualBluePrec );
     }

-    
+

     m_visualDepth = xdepth;
     if (xdepth == 16)
         xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec;
     m_visualDepth = xdepth;
     if (xdepth == 16)
         xdepth = m_visualRedPrec + m_visualGreenPrec + m_visualBluePrec;

-        
+

     m_visualColormapSize = vi->colormap_size;
     m_visualColormapSize = vi->colormap_size;

-        
+

     XFree( vi );
     XFree( vi );

-    
+

     if (m_visualDepth > 8)
         return TRUE;
     if (m_visualDepth > 8)
         return TRUE;

-    
+

     m_visualColormap = new XColor[m_visualColormapSize];
     XColor* colors = (XColor*) m_visualColormap;
     m_visualColormap = new XColor[m_visualColormapSize];
     XColor* colors = (XColor*) m_visualColormap;

-    
+

     for (int i = 0; i < m_visualColormapSize; i++)
            colors[i].pixel = i;
 
     XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize );
     for (int i = 0; i < m_visualColormapSize; i++)
            colors[i].pixel = i;
 
     XQueryColors( xdisplay, DefaultColormap(xdisplay,xscreen), colors, m_visualColormapSize );

-        
+

     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 
     for (int r = 0; r < 32; r++)
     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 
     for (int r = 0; r < 32; r++)


@@ -1109,7 +1109,7 @@ bool wxApp::OnInitGui()
         }
     }
 #endif
         }
     }
 #endif

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -1221,12 +1221,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 #ifdef __WXDEBUG__
 
 
 #ifdef __WXDEBUG__
 

-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
+void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)

 {
     // While the GUI isn't working that well, just print out the
     // message.
 #if 1
 {
     // While the GUI isn't working that well, just print out the
     // message.
 #if 1

-    wxAppBase::OnAssert(file, line, msg);
+    wxAppBase::OnAssert(file, line, cond, msg);

 #else
     wxString msg2;
     msg2.Printf("At file %s:%d: %s", file, line, msg);
 #else
     wxString msg2;
     msg2.Printf("At file %s:%d: %s", file, line, msg);