[Audacity-cvs] audacity-src/src Project.cpp, 1.471, 1.472 Project.h, 1.172, 1.173

[Leland Lucius]

Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13395

Modified Files:
        Project.cpp Project.h 
Log Message:
Fix initial window size (patch from Ed)



Index: Project.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.h,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- Project.h   8 Nov 2009 04:18:53 -0000       1.172
+++ Project.h   11 Nov 2009 08:39:20 -0000      1.173
@@ -463,7 +463,7 @@
    wxString mHelpPref;
    wxString mSoloPref;
 
-   void SetNormalizedWindowState(wxRect & pSizeAndLocation) {  
mNormalizedWindowState = pSizeAndLocation;   }
+   void SetNormalizedWindowState(wxRect pSizeAndLocation) {  
mNormalizedWindowState = pSizeAndLocation;   }
    wxRect GetNormalizedWindowState() const { return mNormalizedWindowState;   }
 
  private:

Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -d -r1.471 -r1.472
--- Project.cpp 8 Nov 2009 04:18:53 -0000       1.471
+++ Project.cpp 11 Nov 2009 08:39:20 -0000      1.472
@@ -1024,12 +1024,6 @@
 
    gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), &mRate, 
AudioIO::GetOptimalSupportedSampleRate());
    mDefaultFormat = (sampleFormat) 
gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleFormat"), floatSample);
-   wxRect normalRect;
-   gPrefs->Read(wxT("/Window/Normal_X"), &normalRect.x);
-   gPrefs->Read(wxT("/Window/Normal_Y"), &normalRect.y);
-   gPrefs->Read(wxT("/Window/Normal_Width"), &normalRect.width);
-   gPrefs->Read(wxT("/Window/Normal_Height"), &normalRect.height);
-   SetNormalizedWindowState(normalRect);
 }
 
 void AudacityProject::UpdatePrefs()
@@ -1542,18 +1536,16 @@
 
 void AudacityProject::OnMove(wxMoveEvent & event)
 {
-   wxRect rect(this->GetRect());
    if (!this->IsMaximized() && !this->IsIconized())
-      SetNormalizedWindowState(rect);
+      SetNormalizedWindowState(this->GetRect());
    event.Skip();
 }
 
 void AudacityProject::OnSize(wxSizeEvent & event)
 {
    HandleResize();
-   wxRect rect(this->GetRect());
    if (!this->IsMaximized() && !this->IsIconized())
-      SetNormalizedWindowState(rect);
+      SetNormalizedWindowState(this->GetRect());
    event.Skip();
 }
 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs