Fill in more details for the wxEVT_STC_AUTOCOMP_SELECTION event

[wxWidgets.git] / contrib / samples / fl / fl_sample2.cpp

diff --git a/contrib/samples/fl/fl_sample2.cpp b/contrib/samples/fl/fl_sample2.cpp
index 47f293e9f62d7c25bdac660050c9b1acc44d01d4..74c4ede313fa8ac31c07a02cc9e5c6ef6b4ad41d 100644 (file)
--- a/contrib/samples/fl/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Contrib. demo
 // Author:      Aleksandras Gluchovas
 // Modified by: Sebastian Haase (June 21, 2001)
 // Purpose:     Contrib. demo
 // Author:      Aleksandras Gluchovas
 // Modified by: Sebastian Haase (June 21, 2001)

-// Created:     24/11/98     
+// Created:     24/11/98

 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
 // Licence:     wxWindows license


@@ -35,7 +35,7 @@
 
 
 class MyApp: public wxApp
 
 
 class MyApp: public wxApp

-{ 
+{

 public:
     bool OnInit(void);
 };
 public:
     bool OnInit(void);
 };


@@ -45,20 +45,20 @@ class MyFrame: public wxFrame
 protected:
     wxFrameLayout* mpLayout;
     wxWindow*      mpClientWnd;
 protected:
     wxFrameLayout* mpLayout;
     wxWindow*      mpClientWnd;

-    
+

     wxTextCtrl* CreateTextCtrl( const wxString& value );
     wxTextCtrl* CreateTextCtrl( const wxString& value );

-        
+

 public:
     MyFrame( wxWindow* parent, const wxChar *title );
     ~MyFrame();
 public:
     MyFrame( wxWindow* parent, const wxChar *title );
     ~MyFrame();

-    
+

     void populateMyFrame();
     void OnLoad( wxCommandEvent& event );
     void OnStore( wxCommandEvent& event );
     void OnQuit( wxCommandEvent& event );
     void populateMyFrame();
     void OnLoad( wxCommandEvent& event );
     void OnStore( wxCommandEvent& event );
     void OnQuit( wxCommandEvent& event );

-    
-    bool OnClose(void) { return TRUE; }
-    
+
+    bool OnClose(void) { return true; }
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -68,30 +68,32 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    // wxWindows boiler-plate:
-    
+    // wxWidgets boiler-plate:
+

     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));

-    
+

     wxMenu *file_menu = new wxMenu;
     wxMenu *file_menu = new wxMenu;

-    
+

     file_menu->Append( ID_LOAD,  _("&Load layout")  );
     file_menu->Append( ID_STORE, _("&Store layout")  );
     file_menu->AppendSeparator();
     file_menu->Append( ID_LOAD,  _("&Load layout")  );
     file_menu->Append( ID_STORE, _("&Store layout")  );
     file_menu->AppendSeparator();

-    
+

     file_menu->Append( ID_QUIT, _("E&xit") );
     file_menu->Append( ID_QUIT, _("E&xit") );

-    
+

     wxMenuBar *menu_bar = new wxMenuBar;
     wxMenuBar *menu_bar = new wxMenuBar;

-    
+

     menu_bar->Append(file_menu, _("&File"));
     menu_bar->Append(file_menu, _("&File"));

-    
+
+#if wxUSE_STATUSBAR

     frame->CreateStatusBar(3);
     frame->CreateStatusBar(3);

+#endif // wxUSE_STATUSBAR

     frame->SetMenuBar(menu_bar);
     frame->SetMenuBar(menu_bar);

-    
-    frame->Show(TRUE);
+
+    frame->Show(true);

     SetTopWindow(frame);
     frame->populateMyFrame();
     SetTopWindow(frame);
     frame->populateMyFrame();

-    
-    return TRUE;
+
+    return true;

 }
 
 /***** Immlementation for class MyFrame *****/
 }
 
 /***** Immlementation for class MyFrame *****/


@@ -103,10 +105,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
 END_EVENT_TABLE()
 
 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )

-    : wxFrame( parent, -1, _("NewTest-II"), wxDefaultPosition,
+    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,

           wxSize( 700, 500 ),
           wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
           wxSize( 700, 500 ),
           wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |

-          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
+          wxRESIZE_BORDER   | wxSYSTEM_MENU  | wxCAPTION | wxCLOSE_BOX,

           wxT("freimas") )
 {
 }
           wxT("freimas") )
 {
 }


@@ -114,45 +116,45 @@ MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
 void MyFrame::populateMyFrame()
 {
     mpClientWnd = CreateTextCtrl( _("Client window") );
 void MyFrame::populateMyFrame()
 {
     mpClientWnd = CreateTextCtrl( _("Client window") );

-    
+

     mpLayout = new wxFrameLayout( this, mpClientWnd );
     mpLayout = new wxFrameLayout( this, mpClientWnd );

-        
+

     ///  mpLayout->PushDefaultPlugins();
     ///  mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
     ///  //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
     ///  mpLayout->PushDefaultPlugins();
     ///  mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso
     ///  //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );

-        
-    cbDimInfo sizes( 80,65,     // when docked horizontally      
-                     80,165,    // when docked vertically        
-                     180,30,    // when floated                  
-                     TRUE,      // the bar is fixed-size
+
+    cbDimInfo sizes( 80,65,     // when docked horizontally
+                     80,165,    // when docked vertically
+                     180,30,    // when floated
+                     true,      // the bar is fixed-size

                      5,         // vertical gap (bar border)
                      5          // horizontal gap (bar border)
                      5,         // vertical gap (bar border)
                      5          // horizontal gap (bar border)

-                   ); 
-        
-    // drop-in 20 bars    
+                   );
+
+    // drop-in 20 bars

     for( int i = 1; i <= 10; ++i )
     {
         wxSleep(1);
         wxYield(); // CHECK!
     for( int i = 1; i <= 10; ++i )
     {
         wxSleep(1);
         wxYield(); // CHECK!

-        
+

         wxChar buf[4];
         wxSprintf( buf, wxT("%d"), i );
         wxString name = wxString(wxT("Bar-"));
         name += buf;
         wxChar buf[4];
         wxSprintf( buf, wxT("%d"), i );
         wxString name = wxString(wxT("Bar-"));
         name += buf;

-        
+

         //sizes.mIsFixed = i % 2 > 0; // every fifth bar is not fixed-size
         //sizes.mIsFixed = i % 2 > 0; // every fifth bar is not fixed-size

-        
+

         if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
         if ( !sizes.mIsFixed ) name += wxT(" (flexible)");

-        //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
-        mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
-                          sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
-                          0,                   // insert into 0th row (vert. position)
-                          0,                   // offset from the start of row (in pixels)
-                          name                 // name to refere in customization pop-ups
+        //      mpLayout->AddBar( CreateTextCtrl(name), // bar window
+        mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name), // bar window
+                          sizes, i % MAX_PANES, // alignment ( 0-top,1-bottom, etc)
+                          0,                    // insert into 0th row (vert. position)
+                          0,                    // offset from the start of row (in pixels)
+                          name                  // name to refere in customization pop-ups

                         );
 
         mpLayout->RecalcLayout(true);
                         );
 
         mpLayout->RecalcLayout(true);

-        
+

         // Layout();
         // Refresh();
     }
         // Layout();
         // Refresh();
     }


@@ -161,34 +163,33 @@ void MyFrame::populateMyFrame()
 MyFrame::~MyFrame()
 {
     // layout is not a window, should be released manually
 MyFrame::~MyFrame()
 {
     // layout is not a window, should be released manually

-    if ( mpLayout ) 
+    if ( mpLayout )

         delete mpLayout;
 }
 
 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
         delete mpLayout;
 }
 
 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {

-    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value,

                                 wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
                                 wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );

-    
+

     pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
     pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );

-    
+

     return pCtrl;
 }
 
     return pCtrl;
 }
 

-void MyFrame::OnLoad( wxCommandEvent& event )
+void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) )

 {
     wxMessageBox(wxT("Hey - you found a BIG question-mark !!"));
 }
 
 {
     wxMessageBox(wxT("Hey - you found a BIG question-mark !!"));
 }
 

-void MyFrame::OnStore( wxCommandEvent& event )
+void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )

 {
     wxMessageBox(wxT("Hey - you found another BIG question-mark !!"));
 }
 
 {
     wxMessageBox(wxT("Hey - you found another BIG question-mark !!"));
 }
 

-void MyFrame::OnQuit( wxCommandEvent& event )
+void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )

 {
 {

-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
-    
-    Close(TRUE);
-}
+    Show( false ); // TRICK:: hide it, to avoid flickered destruction

 
 

+    Close(true);
+}