[Wxdevcenter-cvs] wxDevCenter/src Application.cpp,1.21,1.22 MainFrame.cpp,1.13,1.14

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/wxDevCenter/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20642/src

Modified Files:
	Application.cpp MainFrame.cpp 
Log Message:
Changement mineurs de positionnement initial des workbars.

Index: Application.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Application.cpp	4 Apr 2005 08:11:22 -0000	1.21
--- Application.cpp	4 Apr 2005 10:25:53 -0000	1.22
***************
*** 46,64 ****
  using namespace wxDevCenter;
  
- 
- class TestBar : public WorkBar
- {
-     DECLARE_DYNAMIC_CLASS(TestBar);
- public:
-     virtual bool Create(wxWindow* parent)
-     {
-         WorkBar::Create(parent);
-         new wxButton(this, 6000, wxT("Blablabla"));
-         return true;
-     }
- };
- 
- IMPLEMENT_DYNAMIC_CLASS(TestBar, WorkBar)
- 
  BEGIN_EVENT_TABLE(Application, wxApp)
      EVT_MENU(wxID_EXIT, Application::OnExitMenu)
--- 46,49 ----
***************
*** 66,70 ****
  
  
- 
  bool Application::OnInit(void)
  {
--- 51,54 ----
***************
*** 110,116 ****
      wxGetApp().GetWorkBarManager().RegisterFrame(m_pMainFrame);
  
-     // Test des worksbars.
-     m_WorkBarManager.RegisterWorkBar(CLASSINFO(TestBar), "tchock !", "");
- 
      //  Lance l'application.
  	return true;
--- 94,97 ----

Index: MainFrame.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MainFrame.cpp	4 Apr 2005 08:11:23 -0000	1.13
--- MainFrame.cpp	4 Apr 2005 10:25:53 -0000	1.14
***************
*** 467,474 ****
      pWorkBar->Create(this);
  
      // drop in some bars
!     cbDimInfo sizes( 160, 220, // when docked horizontally      
!                       220, 160, // when docked vertically        
!                       160, 220, // when floated                  
                        FALSE,  // the bar is not fixed-size
                        4,      // vertical gap (bar border)
--- 467,476 ----
      pWorkBar->Create(this);
  
+     wxSize sz = pWorkBar->GetMinSize();
+ 
      // drop in some bars
!     cbDimInfo sizes( sz.x, sz.y, // when docked horizontally      
!                      sz.x, sz.y, // when docked vertically        
!                      sz.x, sz.y, // when floated                  
                        FALSE,  // the bar is not fixed-size
                        4,      // vertical gap (bar border)