Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18237
Modified Files:
ToolDock.h ToolManager.cpp ToolDock.cpp ToolBar.cpp
Log Message:
Fix toolbar not resizing with control changes size
Index: ToolManager.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolManager.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ToolManager.cpp 18 Nov 2006 07:45:20 -0000 1.11
+++ ToolManager.cpp 19 Nov 2006 11:14:15 -0000 1.12
@@ -152,6 +152,18 @@
mManager->ProcessEvent( event );
}
+ //
+ // Handle toolbar updates
+ //
+ void OnToolBarUpdate( wxCommandEvent & event )
+ {
+ // Resize floater window to exactly contain toolbar
+ mBar->GetParent()->SetClientSize( mBar->GetMinSize() );
+
+ // Allow it to propagate to our parent
+ event.Skip();
+ }
+
//
// Handle frame paint events
//
@@ -276,6 +288,7 @@
EVT_PAINT( ToolFrame::OnPaint )
EVT_MOUSE_EVENTS( ToolFrame::OnMotion )
EVT_CLOSE( ToolFrame::OnClose )
+ EVT_COMMAND( wxID_ANY, EVT_TOOLBAR_UPDATED, ToolFrame::OnToolBarUpdate )
END_EVENT_TABLE()
IMPLEMENT_CLASS( ToolManager, wxEvtHandler );
Index: ToolDock.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolDock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ToolDock.h 16 Sep 2006 05:54:37 -0000 1.1
+++ ToolDock.h 19 Nov 2006 11:14:15 -0000 1.2
@@ -68,7 +68,6 @@
void OnErase( wxEraseEvent & event );
void OnSize( wxSizeEvent & event );
void OnPaint( wxPaintEvent & event );
- void OnToolBarUpdate( wxCommandEvent & event );
void OnGrabber( GrabberEvent & event );
private:
Index: ToolDock.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolDock.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ToolDock.cpp 22 Oct 2006 09:54:26 -0000 1.4
+++ ToolDock.cpp 19 Nov 2006 11:14:15 -0000 1.5
@@ -446,26 +446,6 @@
mDockedBars.Remove( t );
}
-//
-// Handle toolbar updates
-//
-void ToolDock::OnToolBarUpdate( wxCommandEvent & event )
-{
- ToolBar *t = mBars[ event.GetId() ];
-
- // Resize floater window to exactly contain toolbar
- if( !t->IsDocked() )
- {
- t->GetParent()->SetClientSize( t->GetMinSize() );
- }
-
- // Update the layout
- LayoutToolBars();
-
- // Allow it to propagate to our parent
- event.Skip();
-}
-
//
// Handle sizing
//
Index: ToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ToolBar.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ToolBar.cpp 18 Nov 2006 07:45:20 -0000 1.6
+++ ToolBar.cpp 19 Nov 2006 11:14:15 -0000 1.7
@@ -278,7 +278,7 @@
void ToolBar::Updated()
{
wxCommandEvent e( EVT_TOOLBAR_UPDATED, GetId() );
- mParent->GetEventHandler()->AddPendingEvent( e );
+ GetParent()->GetEventHandler()->AddPendingEvent( e );
}
//
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
