Fixed resizing of wxTextCtrl

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index fb0c54118ad9d753df4d5b8762942a71aed6d407..f65ab8ecafa32e8055e8105c821a3a178032d4d0 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -2,9 +2,8 @@
 // Name:        app.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        app.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -24,10 +23,6 @@
 
 #include "unistd.h"
 
 
 #include "unistd.h"
 

-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------


@@ -38,6 +33,74 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 extern wxList wxPendingDelete;
 extern wxResourceCache *wxTheResourceCache;
 
 extern wxList wxPendingDelete;
 extern wxResourceCache *wxTheResourceCache;
 

+unsigned char g_palette[64*3] =
+{
+  0x0,  0x0,  0x0,
+  0xff, 0xff, 0xff,
+  0xff, 0x0,  0x0,
+  0xff, 0xff, 0x0,
+  0x0,  0xff, 0x0,
+  0x0,  0x0,  0xff,
+  0x0,  0xff, 0xff,
+  0x99, 0x99, 0x99,
+  0xff, 0x88, 0x0,
+  0x88, 0x0,  0x0,
+  0x0,  0x88, 0x88,
+  0x88, 0x88, 0x0,
+  0xff, 0xcc, 0x97,
+  0xbb, 0xbb, 0xbb,
+  0x9f, 0x6b, 0x42,
+  0x55, 0x55, 0x55,
+  0xdd, 0xdd, 0xdd,
+  0x77, 0x77, 0x77,
+  0x33, 0x33, 0x33,
+  0xcc, 0x0,  0x0,
+  0xff, 0x44, 0x0,
+  0xff, 0xcc, 0x0,
+  0xcc, 0xcc, 0x0,
+  0x60, 0x60, 0x0,
+  0x0,  0x43, 0x0,
+  0x0,  0x7f, 0x0,
+  0x0,  0xcc, 0x0,
+  0x0,  0x44, 0x44,
+  0x0,  0x0,  0x44,
+  0x0,  0x0,  0x88,
+  0xef, 0xb1, 0x7b,
+  0xdf, 0x98, 0x5f,
+  0xbf, 0x87, 0x56,
+  0x7f, 0x57, 0x26,
+  0x5f, 0x39, 0xc,
+  0x3f, 0x1c, 0x0,
+  0x21, 0x0,  0x0,
+  0x0,  0x43, 0x87,
+  0x2d, 0x70, 0xaf,
+  0x5a, 0x9e, 0xd7,
+  0x87, 0xcc, 0xff,
+  0xff, 0xe0, 0xba,
+  0x21, 0x43, 0xf,
+  0x3d, 0x5d, 0x25,
+  0x59, 0x78, 0x3a,
+  0x75, 0x93, 0x4f,
+  0x91, 0xae, 0x64,
+  0xad, 0xc8, 0x7a,
+  0xf0, 0xa8, 0xef, 
+  0xd0, 0x88, 0xd0,
+  0xaf, 0x66, 0xaf,
+  0x8e, 0x44, 0x8e,
+  0x6d, 0x22, 0x6d,
+  0x4b, 0x0,  0x4b, 
+  0xff, 0xc0, 0xbc,
+  0xff, 0x93, 0x91,
+  0xff, 0x66, 0x67,
+  0xd8, 0xf2, 0xbf,
+  0xff, 0xc9, 0x68,
+  0xff, 0x96, 0x67,
+  0xa5, 0x60, 0xff,
+  0x51, 0xff, 0x99,
+  0x3f, 0xa5, 0x63,
+  0x98, 0x90, 0x67
+};
+

 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // local functions
 //-----------------------------------------------------------------------------


@@ -260,30 +323,14 @@ void wxApp::CommonInit(void)
 
   wxInitializeResourceSystem();
 
 
   wxInitializeResourceSystem();
 

-  // For PostScript printing
-#if wxUSE_POSTSCRIPT
-/* Now done in wxPostScriptModule
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
- */
-#endif
-
-
-/*
-  wxBitmap::InitStandardHandlers();
-
-  g_globalCursor = new wxCursor;
-*/
+  wxImage::InitStandardHandlers();
+  
+//  g_globalCursor = new wxCursor;

 }
 
 void wxApp::CommonCleanUp(void)
 {
   wxDELETE(wxTheColourDatabase);
 }
 
 void wxApp::CommonCleanUp(void)
 {
   wxDELETE(wxTheColourDatabase);

-/* Now done in wxPostScriptModule
-  wxDELETE(wxThePrintPaperDatabase);
-  wxDELETE(wxThePrintSetupData);
- */

   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
 
   wxDELETE(wxTheFontNameDirectory);
   wxDeleteStockObjects();
 


@@ -294,6 +341,8 @@ void wxApp::CommonCleanUp(void)
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();
   wxDeleteStockLists();
 
   wxCleanUpResourceSystem();

+  
+  wxImage::CleanUpHandlers();

 
   wxSystemSettings::Done();
 }
 
   wxSystemSettings::Done();
 }


@@ -313,7 +362,7 @@ int wxEntry( int argc, char *argv[] )
 
   wxClassInfo::InitializeClasses();
 
 
   wxClassInfo::InitializeClasses();
 

-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 
   streambuf* sBuf = new wxDebugStreamBuf;
   ostream* oStr = new ostream(sBuf) ;
 
   streambuf* sBuf = new wxDebugStreamBuf;
   ostream* oStr = new ostream(sBuf) ;


@@ -355,15 +404,22 @@ int wxEntry( int argc, char *argv[] )
   
   gtk_init( &argc, &argv );
 
   
   gtk_init( &argc, &argv );
 

-#ifdef wxUSE_GDK_IMLIB
-
-  gdk_imlib_init();
-
-  gtk_widget_push_visual(gdk_imlib_get_visual());
-
-  gtk_widget_push_colormap(gdk_imlib_get_colormap());
+  GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );

 
 

-#endif
+  for (int i = 0; i < 64; i++)
+  {
+    GdkColor col;
+    col.red    = g_palette[i*3 + 0] << 8;
+    col.green  = g_palette[i*3 + 1] << 8;
+    col.blue   = g_palette[i*3 + 2] << 8;
+    col.pixel  = 0;
+    
+    gdk_color_alloc( cmap, &col );
+  }
+  
+  gtk_widget_push_colormap( cmap );
+  
+  gtk_widget_set_default_colormap( cmap );

 
   wxApp::CommonInit();
 
 
   wxApp::CommonInit();
 


@@ -396,7 +452,7 @@ int wxEntry( int argc, char *argv[] )
   
   delete[] wxBuffer;
   
   
   delete[] wxBuffer;
   

-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

   
   if (wxDebugContext::CountObjectsLeft() > 0)
   {
   
   if (wxDebugContext::CountObjectsLeft() > 0)
   {