Added fl (frame layout) to wxWindows, from source tidied by Hans Van Leemputten <Hansvl@softhome.net>.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-24 15:27:12 +00:00
parent 3c85ada9db
commit 8e08b761b0
109 changed files with 21049 additions and 4 deletions
--- a/contrib/samples/fl/fl_sample2/Makefile.in
+++ b/contrib/samples/fl/fl_sample2/Makefile.in
@@ -0,0 +1,25 @@
+#
+# File:         Makefile
+# Author:       Hans Van Leemputten
+# Created:      2001
+# Updated:
+# Copyright:    (c) wxWorkshop team, 2001
+#
+# "%W% %G%"
+#
+# Makefile : Builds sample on UNIX/Linux.
+
+top_srcdir = @top_srcdir@/..
+top_builddir = ../../../..
+
+TARGET = fl_sample2
+
+program_dir = contrib/samples/fl/$(TARGET)
+
+APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
+APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
+
+PROGRAM = $(TARGET)
+OBJECTS = $(TARGET).o
+
+include $(top_builddir)/src/makeprog.env
--- a/contrib/samples/fl/fl_sample2/fl_demo.dsp
+++ b/contrib/samples/fl/fl_sample2/fl_demo.dsp
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="fl_sample2" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=fl_sample2 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "fl_demo.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample2 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "fl_sample2 - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "fl_sample2 - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "fl_sample2 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "NDEBUG"
+# ADD RSC /l 0x809 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../lib" /libpath:"../../contrib/lib"
+
+!ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD BASE RSC /l 0x809 /d "_DEBUG"
+# ADD RSC /l 0x809 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "fl_sample2 - Win32 Release"
+# Name "fl_sample2 - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\fl_sample2.cpp
+
+!IF  "$(CFG)" == "fl_sample2 - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Debug"
+
+# ADD CPP /Yc"wx/wxprec.h"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\fl_sample2.rc
+# End Source File
+# End Target
+# End Project
--- a/contrib/samples/fl/fl_sample2/fl_demo.dsw
+++ b/contrib/samples/fl/fl_sample2/fl_demo.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "fl_sample2"=.\fl_demo.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/contrib/samples/fl/fl_sample2/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2/fl_sample2.cpp
@@ -0,0 +1,194 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        fl_sample2.cpp
+// Purpose:     Contrib. demo
+// Author:      Aleksandras Gluchovas
+// Modified by: Sebastian Haase (June 21, 2001)
+// Created:     24/11/98     
+// RCS-ID:      $Id$
+// Copyright:   (c) Aleksandras Gluchovas
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+
+#include "wx/textctrl.h"
+
+// fl headers
+#include "wx/fl/controlbar.h"
+
+// plugins used
+#include "wx/fl/barhintspl.h"
+#include "wx/fl/hintanimpl.h"
+
+#define ID_LOAD  102
+#define ID_STORE 103
+#define ID_QUIT  104
+
+
+class MyApp: public wxApp
+{ 
+public:
+    bool OnInit(void);
+};
+
+class MyFrame: public wxFrame
+{
+protected:
+    wxFrameLayout* mpLayout;
+    wxWindow*      mpClientWnd;
+    
+    wxTextCtrl* CreateTextCtrl( const wxString& value );
+        
+public:
+    MyFrame( wxWindow* parent, char *title );
+    ~MyFrame();
+    
+    void populateMyFrame();
+    void OnLoad( wxCommandEvent& event );
+    void OnStore( wxCommandEvent& event );
+    void OnQuit( wxCommandEvent& event );
+    
+    bool OnClose(void) { return TRUE; }
+    
+    DECLARE_EVENT_TABLE()
+};
+
+/***** Implementation for class MyApp *****/
+
+IMPLEMENT_APP    (MyApp)
+
+bool MyApp::OnInit(void)
+{
+    // wxWindows boiler-plate:
+    
+    MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample");
+    
+    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_QUIT, "E&xit" );
+    
+    wxMenuBar *menu_bar = new wxMenuBar;
+    
+    menu_bar->Append(file_menu, "&File");
+    
+    frame->CreateStatusBar(3);
+    frame->SetMenuBar(menu_bar);
+    
+    frame->Show(TRUE);
+    SetTopWindow(frame);
+    frame->populateMyFrame();
+    
+    return TRUE;
+}
+
+/***** Immlementation for class MyFrame *****/
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU( ID_LOAD,  MyFrame::OnLoad  )
+    EVT_MENU( ID_STORE, MyFrame::OnStore )
+    EVT_MENU( ID_QUIT,  MyFrame::OnQuit  )
+END_EVENT_TABLE()
+
+MyFrame::MyFrame( wxWindow* parent, char *title )
+    : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition,
+          wxSize( 700, 500 ),
+          wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
+          wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
+          "freimas" )
+{
+}
+
+void MyFrame::populateMyFrame()
+{
+    mpClientWnd = CreateTextCtrl( "Client window" );
+    
+    mpLayout = new wxFrameLayout( this, mpClientWnd );
+        
+    ///  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
+                     5,         // vertical gap (bar border)
+                     5          // horizontal gap (bar border)
+                   ); 
+        
+    // drop-in 20 bars    
+    for( int i = 1; i <= 10; ++i )
+    {
+        wxSleep(1);
+        wxYield(); // CHECK!
+        
+        char buf[4];
+        sprintf( buf, "%d", i );
+        wxString name = wxString("Bar-");
+        name += buf;
+        
+        //sizes.mIsFixed = i % 2 > 0; // every fifth bar is not fixed-size
+        
+        if ( !sizes.mIsFixed ) name += " (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->RecalcLayout(true);
+        
+        // Layout();
+        // Refresh();
+    }
+}
+
+MyFrame::~MyFrame()
+{
+    // layout is not a window, should be released manually
+    if ( mpLayout ) 
+        delete mpLayout;
+}
+
+wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
+{
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
+                                wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
+    
+    pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
+    
+    return pCtrl;
+}
+
+void MyFrame::OnLoad( wxCommandEvent& event )
+{
+    wxMessageBox("Hey - you found a BIG question-mark !!");
+}
+
+void MyFrame::OnStore( wxCommandEvent& event )
+{
+    wxMessageBox("Hey - you found another BIG question-mark !!");
+}
+
+void MyFrame::OnQuit( wxCommandEvent& event )
+{
+    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
+    
+    Close(TRUE);
+}
+
--- a/contrib/samples/fl/fl_sample2/fl_sample2.rc
+++ b/contrib/samples/fl/fl_sample2/fl_sample2.rc
@@ -0,0 +1,3 @@
+/* mondrian ICON "mondrian.ico" */
+#include "wx/msw/wx.rc"
+
--- a/contrib/samples/fl/fl_sample2/makefile.b32
+++ b/contrib/samples/fl/fl_sample2/makefile.b32
@@ -0,0 +1,23 @@
+#
+# File:         Makefile
+# Author:       Hans Van Leemputten
+# Created:      2001
+# Updated:
+# Copyright:    (c) wxWorkshop team, 2001
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = ..\..\..\..
+TARGET = fl_sample2
+
+EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
+!if "$(FINAL)" == "1"
+EXTRALIBS = $(WSLIBDIR)\fl.lib
+!else
+EXTRALIBS = $(WSLIBDIR)\fld.lib
+!endif
+
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+
--- a/contrib/samples/fl/fl_sample2/makefile.g95
+++ b/contrib/samples/fl/fl_sample2/makefile.g95
@@ -0,0 +1,18 @@
+#
+# File:         Makefile
+# Author:       Hans Van Leemputten
+# Created:      2001
+# Updated:
+# Copyright:    (c) wxWorkshop team, 2001
+#
+# Makefile for wxWorkshop for mingw & cygwin.
+
+WXDIR = ../../../..
+TARGET = fl_sample2
+
+EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
+EXTRALIBS     = $(WXDIR)/lib/libfl.a
+
+OBJECTS = $(TARGET).o
+
+include $(WXDIR)/src/makeprog.g95
--- a/contrib/samples/fl/fl_sample2/makefile.vc
+++ b/contrib/samples/fl/fl_sample2/makefile.vc
@@ -0,0 +1,24 @@
+#
+# File:         Makefile
+# Author:       Hans Van Leemputten
+# Created:      2001
+# Updated:
+# Copyright:    (c) wxWorkshop team, 2001
+#
+# Makefile : Builds fl sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+WXDIR = ..\..\..\..
+TARGET = fl_sample2
+
+EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
+!if "$(FINAL)" == "1"
+EXTRALIBS = $(WXDIR)\lib\fl.lib
+!else
+EXTRALIBS = $(WXDIR)\lib\fld.lib
+!endif
+
+PROGRAM = $(TARGET)
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.vc