Fixed resizing of wxTextCtrl

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 391f5a8d1c7219b01508f0d4c4a3f43dda16ba42..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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,24 +14,92 @@
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

-#include "wx/postscrp.h"

 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/log.h"

+#include "wx/memory.h"
+#include "wx/font.h"
+#include "wx/settings.h"
+#include "wx/resource.h"

 
 #include "unistd.h"
 
 
 #include "unistd.h"
 

-#ifdef USE_GDK_IMLIB
-#include "gdk_imlib.h"
-#endif
-

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

-wxApp *wxTheApp = NULL;
+wxApp *wxTheApp = (wxApp *)  NULL;

 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 extern wxList wxPendingDelete;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 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


@@ -47,13 +114,13 @@ extern void wxFlushResources(void);
 void wxExit(void)
 {
   gtk_main_quit();
 void wxExit(void)
 {
   gtk_main_quit();

-};
+}

 
 bool wxYield(void)
 {
   while (gtk_events_pending() > 0) gtk_main_iteration();
   return TRUE;
 
 bool wxYield(void)
 {
   while (gtk_events_pending() > 0) gtk_main_iteration();
   return TRUE;

-};
+}

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -61,76 +128,149 @@ bool wxYield(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 

+BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
+    EVT_IDLE(wxApp::OnIdle)
+END_EVENT_TABLE()
+

 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {

-  if (wxTheApp) wxTheApp->OnIdle();
+  if (wxTheApp) while (wxTheApp->ProcessIdle()) {}

   usleep( 10000 );
   return TRUE;
   usleep( 10000 );
   return TRUE;

-};
+}

 
 wxApp::wxApp()
 {
   m_idleTag = 0;
 
 wxApp::wxApp()
 {
   m_idleTag = 0;

-  m_topWindow = NULL;
+  m_topWindow = (wxWindow *) NULL;

   m_exitOnFrameDelete = TRUE;
   m_exitOnFrameDelete = TRUE;

-};
+  wxTheApp = this;
+}

 
 wxApp::~wxApp(void)
 {
   gtk_idle_remove( m_idleTag );
 
 wxApp::~wxApp(void)
 {
   gtk_idle_remove( m_idleTag );

-};
+}

 
 bool wxApp::OnInit(void)
 {
   return TRUE;
 
 bool wxApp::OnInit(void)
 {
   return TRUE;

-};
+}

 
 bool wxApp::OnInitGui(void)
 
 bool wxApp::OnInitGui(void)

-{ 
+{

   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );
   m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL );

-  return TRUE; 
-};
+  return TRUE;
+}

 
 

-int wxApp::OnRun(void) 
-{ 
-  return MainLoop(); 
-};
+int wxApp::OnRun(void)
+{
+  return MainLoop();
+}

 
 

-bool wxApp::OnIdle(void)
+bool wxApp::ProcessIdle(void)

 {
 {

+  wxIdleEvent event;
+  event.SetEventObject( this );
+  ProcessEvent( event );
+
+  return event.MoreRequested();
+}
+
+void wxApp::OnIdle( wxIdleEvent &event )
+{
+  static bool inOnIdle = FALSE;
+
+  // Avoid recursion (via ProcessEvent default case)
+  if (inOnIdle)
+    return;
+
+  inOnIdle = TRUE;
+
+  // 'Garbage' collection of windows deleted with Close().

   DeletePendingObjects();
   DeletePendingObjects();

-  return FALSE;
-};
+
+  // flush the logged messages if any
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL && pLog->HasPendingMessages() )
+    pLog->Flush();
+
+  // Send OnIdle events to all windows
+  bool needMore = SendIdleEvents();
+
+  if (needMore)
+    event.RequestMore(TRUE);
+
+  inOnIdle = FALSE;
+}
+
+bool wxApp::SendIdleEvents(void)
+{
+    bool needMore = FALSE;
+       wxNode* node = wxTopLevelWindows.First();
+       while (node)
+       {
+               wxWindow* win = (wxWindow*) node->Data();
+               if (SendIdleEvents(win))
+            needMore = TRUE;
+
+               node = node->Next();
+       }
+    return needMore;
+}
+
+bool wxApp::SendIdleEvents( wxWindow* win )
+{
+    bool needMore = FALSE;
+
+       wxIdleEvent event;
+       event.SetEventObject(win);
+       win->ProcessEvent(event);
+
+    if (event.MoreRequested())
+        needMore = TRUE;
+
+       wxNode* node = win->GetChildren()->First();
+       while (node)
+       {
+               wxWindow* win = (wxWindow*) node->Data();
+               if (SendIdleEvents(win))
+            needMore = TRUE;
+
+               node = node->Next();
+       }
+    return needMore ;
+}

 
 int wxApp::OnExit(void)
 {
   return 0;
 
 int wxApp::OnExit(void)
 {
   return 0;

-};
+}

 
 int wxApp::MainLoop(void)
 {
   gtk_main();
   return 0;
 
 int wxApp::MainLoop(void)
 {
   gtk_main();
   return 0;

-};
+}

 
 void wxApp::ExitMainLoop(void)
 {
   gtk_main_quit();
 
 void wxApp::ExitMainLoop(void)
 {
   gtk_main_quit();

-};
+}

 
 bool wxApp::Initialized(void)
 {
   return m_initialized;
 
 bool wxApp::Initialized(void)
 {
   return m_initialized;

-};
+}

 
 

-bool wxApp::Pending(void) 
+bool wxApp::Pending(void)

 {
   return FALSE;
 {
   return FALSE;

-};
+}

 
 

-void wxApp::Dispatch(void) 
+void wxApp::Dispatch(void)

 {
 {

-};
+}

 
 void wxApp::DeletePendingObjects(void)
 {
 
 void wxApp::DeletePendingObjects(void)
 {


@@ -138,66 +278,75 @@ void wxApp::DeletePendingObjects(void)
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();
   while (node)
   {
     wxObject *obj = (wxObject *)node->Data();

-    
+

     delete obj;
 
     if (wxPendingDelete.Member(obj))
       delete node;
 
     node = wxPendingDelete.First();
     delete obj;
 
     if (wxPendingDelete.Member(obj))
       delete node;
 
     node = wxPendingDelete.First();

-  };
-};
+  }
+}

 
 wxWindow *wxApp::GetTopWindow(void)
 {
   if (m_topWindow) return m_topWindow;
   wxNode *node = wxTopLevelWindows.First();
 
 wxWindow *wxApp::GetTopWindow(void)
 {
   if (m_topWindow) return m_topWindow;
   wxNode *node = wxTopLevelWindows.First();

-  if (!node) return NULL;
+  if (!node) return (wxWindow *) NULL;

   return (wxWindow*)node->Data();
   return (wxWindow*)node->Data();

-};
+}

 
 void wxApp::SetTopWindow( wxWindow *win )
 {
   m_topWindow = win;
 
 void wxApp::SetTopWindow( wxWindow *win )
 {
   m_topWindow = win;

-};
+}

 
 void wxApp::CommonInit(void)
 {
 
 /*
 
 void wxApp::CommonInit(void)
 {
 
 /*

-#if USE_RESOURCES
+#if wxUSE_RESOURCES

   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */

+  wxSystemSettings::Init();
+  wxTheResourceCache = new wxResourceCache(wxKEY_STRING);
+
+  wxTheFontNameDirectory =  new wxFontNameDirectory;
+  wxTheFontNameDirectory->Initialize();

 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
 
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();

-  wxInitializeStockObjects();
-
-  // For PostScript printing
-#if USE_POSTSCRIPT
-  wxInitializePrintSetupData();
-  wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-  wxThePrintPaperDatabase->CreateDatabase();
-#endif
-

 
 

-/*
-  wxBitmap::InitStandardHandlers();
+  wxInitializeStockLists();
+  wxInitializeStockObjects();

 
 

-  g_globalCursor = new wxCursor;
-*/
+  wxInitializeResourceSystem();

 
 

-  wxInitializeStockObjects();
-};
+  wxImage::InitStandardHandlers();
+  
+//  g_globalCursor = new wxCursor;
+}

 
 void wxApp::CommonCleanUp(void)
 {
 
 void wxApp::CommonCleanUp(void)
 {

+  wxDELETE(wxTheColourDatabase);
+  wxDELETE(wxTheFontNameDirectory);

   wxDeleteStockObjects();
   wxDeleteStockObjects();

-  
+

   wxFlushResources();
   wxFlushResources();

-};
-    
+
+  wxDELETE(wxTheResourceCache);
+
+  wxDeleteStockLists();
+
+  wxCleanUpResourceSystem();
+  
+  wxImage::CleanUpHandlers();
+
+  wxSystemSettings::Done();
+}
+

 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;
 wxLog *wxApp::CreateLogTarget()
 {
   return new wxLogGui;


@@ -212,47 +361,66 @@ int wxEntry( int argc, char *argv[] )
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();
   wxBuffer = new char[BUFSIZ + 512];
 
   wxClassInfo::InitializeClasses();

-  
+
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+
+  streambuf* sBuf = new wxDebugStreamBuf;
+  ostream* oStr = new ostream(sBuf) ;
+  wxDebugContext::SetStream(oStr, sBuf);
+
+#endif
+

   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
     {
       printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
       return 0;
   if (!wxTheApp)
   {
     if (!wxApp::GetInitializerFunction())
     {
       printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
       return 0;

-    };
-    
+    }
+

     wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
     wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();

-    
+

     wxObject *test_app = app_ini();
     wxObject *test_app = app_ini();

-    
+

     wxTheApp = (wxApp*) test_app;
     wxTheApp = (wxApp*) test_app;

-    
-//    wxTheApp = (wxApp*)( app_ini() );
-  };
-  
-  if (!wxTheApp) 
+  }
+
+  if (!wxTheApp)

   {
     printf( "wxWindows error: wxTheApp == NULL\n" );
     return 0;
   {
     printf( "wxWindows error: wxTheApp == NULL\n" );
     return 0;

-  };
+  }

 
 

-//  printf( "Programmstart.\n" );
-  

   wxTheApp->argc = argc;
   wxTheApp->argv = argv;
   wxTheApp->argc = argc;
   wxTheApp->argv = argv;

+
+  char name[200];
+  strcpy( name, argv[0] );
+  strcpy( name, wxFileNameFromPath(name) );
+  wxStripExtension( name );
+  wxTheApp->SetAppName( name );
+  
+  gtk_set_locale();

   
   gtk_init( &argc, &argv );
 
   
   gtk_init( &argc, &argv );
 

-#ifdef USE_GDK_IMLIB
+  GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );

 
 

-  gdk_imlib_init();
-  
-  gtk_widget_push_visual(gdk_imlib_get_visual());
+  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(gdk_imlib_get_colormap());
+  gtk_widget_push_colormap( cmap );

   
   

-#endif  
-    
+  gtk_widget_set_default_colormap( cmap );
+

   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();
   wxApp::CommonInit();
 
   wxTheApp->OnInitGui();


@@ -260,29 +428,50 @@ int wxEntry( int argc, char *argv[] )
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().
   // Here frames insert themselves automatically
   // into wxTopLevelWindows by getting created
   // in OnInit().

-  
+

   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
   if (!wxTheApp->OnInit()) return 0;
 
   wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);

-  
+

   int retValue = 0;
   int retValue = 0;

-  
+

   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();

+
+  wxTheApp->DeletePendingObjects();
+
+  wxTheApp->OnExit();
+
+  wxApp::CommonCleanUp();
+
+  wxDELETE(wxTheApp);
+
+  wxLog *oldLog = wxLog::SetActiveTarget( NULL );
+  if (oldLog) delete oldLog;

   
   

-  wxTheApp->DeletePendingObjects();  
+  wxClassInfo::CleanUpClasses();

   
   

-  wxTheApp->OnExit();
+  delete[] wxBuffer;

   
   

-  wxApp::CommonCleanUp();
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+  
+  if (wxDebugContext::CountObjectsLeft() > 0)
+  {
+    wxTrace("There were memory leaks.\n");
+    wxDebugContext::Dump();
+    wxDebugContext::PrintStatistics();
+  }
+  wxDebugContext::SetStream(NULL, NULL);

   
   

+#endif
+

   return retValue;
   return retValue;

-};
+}

 
 //-----------------------------------------------------------------------------
 // main()
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // main()
 //-----------------------------------------------------------------------------
 

-#if defined(AIX) || defined(AIX4) /* || defined(____HPUX__) */
+#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN)

 
  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h
 
 
  // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h