Remove dead code for macos versions 10.6 and older

master
Rye 2025-08-22 03:08:28 -04:00
parent fdf404c461
commit e5ccf7a2a3
7 changed files with 3 additions and 48 deletions

View File

@ -42,7 +42,6 @@
unsigned int mMarkedTextLength;
bool mMarkedTextAllowed;
bool mSimulatedRightClick;
bool mOldResize;
}
- (id) initWithSamples:(NSUInteger)samples;
- (id) initWithSamples:(NSUInteger)samples andVsync:(BOOL)vsync;
@ -50,8 +49,6 @@
- (void)commitCurrentPreedit;
- (void) setOldResize:(bool)oldresize;
// rebuildContext
// Destroys and recreates a context with the view's internal format set via setPixelFormat;
// Use this in event of needing to rebuild a context for whatever reason, without needing to assign a new pixel format.
@ -68,7 +65,6 @@
- (unsigned long) getVramSize;
- (void) allowMarkedTextInput:(bool)allowed;
- (void) viewDidEndLiveResize;
@end

View File

@ -111,16 +111,6 @@ attributedStringInfo getSegments(NSAttributedString *str)
@implementation LLOpenGLView
// Force a high quality update after live resizing
- (void) viewDidEndLiveResize
{
if (mOldResize) //Maint-3135
{
NSSize size = [self frame].size;
callResize(size.width, size.height);
}
}
- (unsigned long)getVramSize
{
CGLRendererInfoObj info = 0;
@ -175,18 +165,10 @@ attributedStringInfo getSegments(NSAttributedString *str)
}
}
- (void)setOldResize:(bool)oldresize
{
mOldResize = oldresize;
}
- (void)windowResized:(NSNotification *)notification;
{
if (!mOldResize) //Maint-3288
{
NSSize dev_sz = [self convertSizeToBacking:[self frame].size];
callResize(dev_sz.width, dev_sz.height);
}
NSSize dev_sz = [self convertSizeToBacking:[self frame].size];
callResize(dev_sz.width, dev_sz.height);
}
- (void)windowWillMiniaturize:(NSNotification *)notification;
@ -291,9 +273,7 @@ attributedStringInfo getSegments(NSAttributedString *str)
GLint swapInterval=0;
[glContext setValues:&swapInterval forParameter:NSOpenGLContextParameterSwapInterval];
}
mOldResize = false;
return self;
}

View File

@ -147,7 +147,6 @@ public:
virtual void swapBuffers() = 0;
virtual void bringToFront() = 0;
virtual void focusClient() { }; // this may not have meaning or be required on other platforms, therefore, it's not abstract
virtual void setOldResize(bool oldresize) { };
// handy coordinate space conversion routines
// NB: screen to window and vice verse won't work on width/height coordinate pairs,
// as the conversion must take into account left AND right border widths, etc.

View File

@ -100,7 +100,6 @@ bool isCGCursorVisible();
void hideNSCursorTillMove(bool hide);
void requestUserAttention();
long showAlert(std::string title, std::string text, int type);
void setResizeMode(bool oldresize, void* glview);
NSWindowRef createNSWindow(int x, int y, int width, int height);

View File

@ -228,11 +228,6 @@ GLViewRef createOpenGLView(NSWindowRef window, unsigned int samples, bool vsync)
return glview;
}
void setResizeMode(bool oldresize, void* glview)
{
[(LLOpenGLView *)glview setOldResize:oldresize];
}
void glSwapBuffers(void* context)
{
[(NSOpenGLContext*)context flushBuffer];

View File

@ -174,9 +174,6 @@ protected:
bool shouldPostQuit() { return mPostQuit; }
//Satisfy MAINT-3135 and MAINT-3288 with a flag.
/*virtual */ void setOldResize(bool oldresize) override {setResizeMode(oldresize, mGLView); }
private:
void restoreGLContext();

View File

@ -3172,17 +3172,6 @@ bool LLAppViewer::initWindow()
LLNotificationsUI::LLNotificationManager::getInstance();
#ifdef LL_DARWIN
//Satisfy both MAINT-3135 (OSX 10.6 and earlier) MAINT-3288 (OSX 10.7 and later)
LLOSInfo& os_info = LLOSInfo::instance();
if (os_info.mMajorVer == 10 && os_info.mMinorVer < 7)
{
if ( os_info.mMinorVer == 6 && os_info.mBuild < 8 )
gViewerWindow->getWindow()->setOldResize(true);
}
#endif
if (gSavedSettings.getBOOL("WindowMaximized"))
{
gViewerWindow->getWindow()->maximize();